From bf657dffb840a1f2b5c24fc7820e1b3ed6936e06 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 28 Jan 2016 13:48:17 +0100 Subject: [PATCH] qemu: End nested jobs properly Ending a nested job is no different from ending any other (non-async) job, after all the code in qemuDomainBeginJobInternal does not handle them differently either. Thus we should call qemuDomainObjEndJob to stop nested jobs. Signed-off-by: Jiri Denemark --- src/qemu/qemu_domain.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 09c173ca40..4ea9a71f46 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1933,11 +1933,8 @@ qemuDomainObjExitMonitorInternal(virQEMUDriverPtr driver, if (!hasRefs) priv->mon = NULL; - if (priv->job.active == QEMU_JOB_ASYNC_NESTED) { - qemuDomainObjResetJob(priv); - qemuDomainObjSaveJob(driver, obj); - virCondSignal(&priv->job.cond); - } + if (priv->job.active == QEMU_JOB_ASYNC_NESTED) + qemuDomainObjEndJob(driver, obj); } void qemuDomainObjEnterMonitor(virQEMUDriverPtr driver, -- 2.39.5