]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted
authorPeter Krempa <pkrempa@redhat.com>
Wed, 17 Jul 2019 13:39:57 +0000 (15:39 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 18 Jul 2019 15:59:34 +0000 (17:59 +0200)
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>
src/qemu/qemu_blockjob.c

index c102417e43e3471bc26ccdab1587834b118484e6..097d87f663f87aa6605855355dd15986b392b7b9 100644 (file)
@@ -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);
-    }
 }