From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 17 Jul 2019 13:39:57 +0000 (+0200)
Subject: qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted
X-Git-Tag: v5.6.0-rc1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6316435e4c66e37a1222bb2fbbffba4080ec402;p=thirdparty%2Flibvirt.git

qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted

There's no need to do it if the job is not completed. The new helper
allows to do this with much less hassle in the correct place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index c102417e43..097d87f663 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -315,6 +315,7 @@ qemuBlockJobEventProcessLegacyCompleted(virQEMUDriverPtr driver,
     ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true));
     ignore_value(qemuBlockNodeNamesDetect(driver, vm, asyncJob));
     qemuBlockJobUnregister(job);
+    qemuDomainSaveConfig(vm);
 }
 
 
@@ -381,12 +382,6 @@ qemuBlockJobEventProcessLegacy(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 (job->state == 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);
-    }
 }