From bebe5122b9af50f0b25f47f30e240f4a72e9b8ca Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 17 Oct 2012 14:08:17 +0200 Subject: [PATCH] qemu: Clear async job when p2p migration fails early When p2p migration fails early because qemuMigrationIsAllowed or qemuMigrationIsSafe say migration should be cancelled, we fail to clear the migration-out async job. As a result of that, further APIs called for the same domain may fail with Timed out during operation: cannot acquire state change lock. Reported by Guido Winkelmann. Conflicts: src/qemu/qemu_migration.c - qemuMigrationIsSafe was not there in 0.9.6 yet --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 56d4ecfb98..de5f6d8486 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2219,7 +2219,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, } if (!qemuMigrationIsAllowed(driver, vm, NULL)) - goto cleanup; + goto endjob; resume = virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING; -- 2.47.3