From b6316435e4c66e37a1222bb2fbbffba4080ec402 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 17 Jul 2019 15:39:57 +0200 Subject: [PATCH] qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Ján Tomko --- src/qemu/qemu_blockjob.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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); - } }