From d2c5e42fdd58b2f05f2dbd3adc453b8efeece12c Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Fri, 25 May 2012 18:12:00 +0800 Subject: [PATCH] qemu: fix potential dead lock If we lock the qemu_driver, we should call qemuDomainObjBeginJobWithDriver() not qemuDomainObjBeginJob(). (cherry picked from commit 5136c5799fabe411eb0fadc59377572e21386d83) --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1cbe47b787..7d71d7b4d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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; }