From e8f167a6236cff7430076849e7938b783f417bc5 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 14 Dec 2016 08:42:43 +0100 Subject: [PATCH] qemu: monitor: Don't resume lockspaces in resume event handler After qemu delivers the resume event it's already running and thus it's too late to enter lockspaces since it may already have modified the disk. The code only creates false log entries in the case when locking is enabled. The lockspace needs to be acquired prior to starting cpus. --- src/qemu/qemu_process.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 721ad6370f..afe3caca95 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -774,17 +774,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); - VIR_DEBUG("Using lock state '%s' on resume event", NULLSTR(priv->lockState)); - if (virDomainLockProcessResume(driver->lockManager, cfg->uri, - vm, priv->lockState) < 0) { - /* Don't free priv->lockState on error, because we need - * to make sure we have state still present if the user - * tries to resume again - */ - goto unlock; - } - VIR_FREE(priv->lockState); - if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", vm->def->name);