From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 16 Mar 2015 15:52:44 +0000 (+0100)
Subject: qemu: block-commit: Mark disk in block jobs only on successful command
X-Git-Tag: v1.2.13.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0fc5533347cd3ac1fd99f8a46f4bcbde8464d30;p=thirdparty%2Flibvirt.git

qemu: block-commit: Mark disk in block jobs only on successful command

Patch 51f9f03a4ca50b070c0fbfb29748d49f583e15e1 introduces a regression
where if a blockCommit operation fails the disk is still marked as being
part of a block job but can't be unmarked later.

(cherry picked from commit ee744b5b387b5123ee40683c52ab40783ffc3020)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0d30b00a20..960f66ca92 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16781,7 +16781,8 @@ qemuDomainBlockCommit(virDomainPtr dom,
         goto endjob;
     }
 
-    disk->blockjob = true;
+    if (ret == 0)
+        disk->blockjob = true;
 
     if (mirror) {
         if (ret == 0) {