From: Erik Skultety <eskultet@redhat.com>
Date: Wed, 3 Dec 2014 12:56:47 +0000 (+0100)
Subject: qemu: Fix virsh freeze when blockcopy storage file is removed
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fe3691f66348d55e88c9811fd79ff9314e053977;p=libvirt.git

qemu: Fix virsh freeze when blockcopy storage file is removed

If someone removes blockcopy storage file when still in mirroring phase
and then requesting blockjob abort using pivot, virsh cmd freezes. This
is not an issue with older qemu versions which did not support
asynchronous jobs (which we prefer by default).
As we have reached the mirroring phase successfully, polling monitor for
blockjob info always returns 1 and the loop never ends.
This fix introduces a check for qemuDomainBlockPivot return code, possibly
skipping the asynchronous waiting completely, if an error occurred and
asynchronous waiting was the preferred method.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1139567
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 31565bb74b..b9935e4a7a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15606,6 +15606,8 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm,
 
         if (disk->mirror && (flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT)) {
             ret = qemuDomainBlockPivot(conn, driver, vm, device, disk);
+            if (ret < 0 && async)
+                goto endjob;
             goto waitjob;
         }
         if (disk->mirror) {