From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Aug 2017 13:36:05 +0000 (+0200)
Subject: qemu: blockjob: Always save config XML when a blockjob is finished
X-Git-Tag: CVE-2017-1000256~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d39173ff7aedc41cf5fad9398a7499311d950baa;p=thirdparty%2Flibvirt.git

qemu: blockjob: Always save config XML when a blockjob is finished

For VMs with persistent config the config may change upon successful
completion of a job. Save it always if a persistent VM finishes a
blockjob. This will simplify further additions.
---

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index f061bb743f..c1b46f7d0a 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -194,11 +194,11 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
     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 (status == VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef) {
+        if (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);