[PATCH 1/4] qemu: blockcopy: Actually unplug unused images when mirror job fails to start

Peter Krempa pkrempa at redhat.com
Thu Jan 23 15:57:02 UTC 2020


If a mirror job fails to start in -blockdev mode we'd not unplug the
backing files we added first because the code on the error path checked
the wrong value. 'rc' is used as status of the code which added the
images, but the state of the 'block(dev)-mirror' call is stored in 'ret'
at that point.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a1dc414ae..3218dc0e23 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18413,7 +18413,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
     qemuBlockJobStarted(job, vm);

  endjob:
-    if (rc < 0 &&
+    if (ret < 0 &&
         virDomainObjIsActive(vm) &&
         (data || crdata)) {
         qemuDomainObjEnterMonitor(driver, vm);
-- 
2.24.1




More information about the libvir-list mailing list