From f7954d6b076aad3710c8124de4a1aa9e7df94ca0 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Aug 2017 15:21:06 +0200
Subject: [PATCH] qemu: blockjob: Always save status XML after block event

The status XML would be saved only for the copy job (in case of success)
or on failure even for other jobs. As the status contains the backing
chain data, which change after success we should always save it on
block job completion.
---
 src/qemu/qemu_blockjob.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 415768ddce..f061bb743f 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -97,7 +97,6 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
     const char *path;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
     virDomainDiskDefPtr persistDisk = NULL;
-    bool save = false;
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
 
     VIR_DEBUG("disk=%s, mirrorState=%s, type=%d, status=%d",
@@ -164,7 +163,6 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
          * rather than reprobing, but we haven't quite completed
          * that conversion to use our XML tracking. */
         disk->mirror = NULL;
-        save = disk->mirrorState != VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
         disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
         disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
         ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk,
@@ -175,7 +173,6 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
 
     case VIR_DOMAIN_BLOCK_JOB_READY:
         disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY;
-        save = true;
         break;
 
     case VIR_DOMAIN_BLOCK_JOB_FAILED:
@@ -187,7 +184,6 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
         }
         disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
         disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
-        save = true;
         diskPriv->blockjob = false;
         break;
 
@@ -195,16 +191,14 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
         break;
     }
 
-    if (save) {
-        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
-            VIR_WARN("Unable to save status on vm %s after block job",
-                     vm->def->name);
-        if (persistDisk && virDomainSaveConfig(cfg->configDir,
-                                               driver->caps,
-                                               vm->newDef) < 0)
-            VIR_WARN("Unable to update persistent definition on vm %s "
-                     "after block job", vm->def->name);
-    }
+    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
+        VIR_WARN("Unable to save status on vm %s after block job", vm->def->name);
+
+    if (persistDisk && virDomainSaveConfig(cfg->configDir,
+                                           driver->caps,
+                                           vm->newDef) < 0)
+        VIR_WARN("Unable to update persistent definition on vm %s "
+                 "after block job", vm->def->name);
 
     qemuDomainEventQueue(driver, event);
     qemuDomainEventQueue(driver, event2);