]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: fix potential dead lock
authorWen Congyang <wency@cn.fujitsu.com>
Fri, 25 May 2012 10:12:00 +0000 (18:12 +0800)
committerCole Robinson <crobinso@redhat.com>
Sun, 12 Aug 2012 22:34:43 +0000 (18:34 -0400)
If we lock the qemu_driver, we should call qemuDomainObjBeginJobWithDriver()
not qemuDomainObjBeginJob().
(cherry picked from commit 5136c5799fabe411eb0fadc59377572e21386d83)

src/qemu/qemu_driver.c

index 1cbe47b7879eaab7fa915dc60d50e7c9ec3b235d..7d71d7b4d47f66a0a72b1e3d1c41aaa0105963d3 100644 (file)
@@ -8874,7 +8874,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain,
             goto cleanup;
         asyncJob = QEMU_ASYNC_JOB_MIGRATION_OUT;
     } else {
-        if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+        if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0)
             goto cleanup;
         asyncJob = QEMU_ASYNC_JOB_NONE;
     }