summaryrefslogtreecommitdiffstats
path: root/libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch')
-rw-r--r--libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch b/libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch
new file mode 100644
index 0000000000..a86263cbd3
--- /dev/null
+++ b/libraries/libvirt/patches/0001-blockjob-correctly-report-active-commit-for-job-info.patch
@@ -0,0 +1,35 @@
+From 2151695a5119a8d7f44d416c730df50a1e42695a Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Tue, 5 Aug 2014 08:49:32 -0600
+Subject: [PATCH 1/3] blockjob: correctly report active commit for job info
+
+Commit 232a31b munged job info to report 'active commit' instead of
+'commit' when generating events, but forgot to also munge the polling
+variant of the command.
+
+* src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Adjust type as
+needed.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit e8cc973041e7ac4ddeefe343af751863c76687fe)
+---
+ src/qemu/qemu_driver.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index a3de784..57cc913 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -15103,6 +15103,9 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm,
+ ret = qemuMonitorBlockJob(priv->mon, device, basePath, backingPath,
+ bandwidth, info, mode, async);
+ qemuDomainObjExitMonitor(driver, vm);
++ if (info && info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT &&
++ disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT)
++ info->type = disk->mirrorJob;
+ if (ret < 0) {
+ if (mode == BLOCK_JOB_ABORT && disk->mirror)
+ disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
+--
+2.0.3
+