[libvirt] [PATCH 2/9] 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 <jdenemar(a)redhat.com>
---
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 da22d1c..85d2ba6 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1899,11 +1899,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.7.1