]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: blockcopy: Actually unplug unused images when mirror job fails to start
authorPeter Krempa <pkrempa@redhat.com>
Fri, 17 Jan 2020 13:07:34 +0000 (14:07 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 24 Jan 2020 12:40:36 +0000 (13:40 +0100)
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@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
src/qemu/qemu_driver.c

index 0a1dc414ae0f76b2366eedd9541efb1c73ceea77..3218dc0e23cb8347f955231f932a013fe6938ebf 100644 (file)
@@ -18413,7 +18413,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
     qemuBlockJobStarted(job, vm);
 
  endjob:
-    if (rc < 0 &&
+    if (ret < 0 &&
         virDomainObjIsActive(vm) &&
         (data || crdata)) {
         qemuDomainObjEnterMonitor(driver, vm);