From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 24 Nov 2015 12:14:29 +0000 (+0100)
Subject: qemu: pass the asyncJob to qemuProcessStartCPUs
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=668a0fef42e0127a7617d15b75c1693c7c72fcda;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: pass the asyncJob to qemuProcessStartCPUs

Now that new domains are started inside a QEMU_ASYNC_JOB_START job,
we need to pass it down to qemuProcessStartCPUs too.

This removes the warning:
qemuDomainObjEnterMonitorInternal:1750 : This thread seems to be the
async job owner; entering monitor without asking for a nested job is
dangerous

Introduced by commit 04c721f, before that this code path was only
executed with QEMU_ASYNC_JOB_NONE.

(This code is not executed on migration, because qemuMigrationPrepareAny
 sets the VIR_QEMU_PROCESS_START_PAUSED flag.)
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2192ad85e..68542e7b8 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5017,7 +5017,7 @@ int qemuProcessStart(virConnectPtr conn,
         /* Allow the CPUS to start executing */
         if (qemuProcessStartCPUs(driver, vm, conn,
                                  VIR_DOMAIN_RUNNING_BOOTED,
-                                 QEMU_ASYNC_JOB_NONE) < 0) {
+                                 asyncJob) < 0) {
             if (virGetLastError() == NULL)
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                "%s", _("resume operation failed"));