]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: pass the asyncJob to qemuProcessStartCPUs
authorJán Tomko <jtomko@redhat.com>
Tue, 24 Nov 2015 12:14:29 +0000 (13:14 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 24 Nov 2015 12:34:56 +0000 (13:34 +0100)
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.)

src/qemu/qemu_process.c

index 2192ad85ef3006891d884e6f51a7b1f1831f4764..68542e7b84020cb9c4b2566c076ec384411a532f 100644 (file)
@@ -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"));