From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 15 Jun 2017 16:38:10 +0000 (+0100)
Subject: migration: hold AioContext lock for loadvm qemu_fclose()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1575829d2aaced8ce6a5728d8e9fbbdee8f80885;p=qemu.git

migration: hold AioContext lock for loadvm qemu_fclose()

migration_incoming_state_destroy() uses qemu_fclose() on the vmstate
file.  Make sure to call it inside an AioContext acquire/release region.

This fixes an 'qemu: qemu_mutex_unlock: Operation not permitted' abort
in loadvm.

This patch closes the vmstate file before ending the drained region.
Previously we closed the vmstate file after ending the drained region.
The order does not matter.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/migration/savevm.c b/migration/savevm.c
index b08df04d59..c7a49c93c5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2300,11 +2300,11 @@ int load_snapshot(const char *name, Error **errp)
 
     aio_context_acquire(aio_context);
     ret = qemu_loadvm_state(f);
+    migration_incoming_state_destroy();
     aio_context_release(aio_context);
 
     bdrv_drain_all_end();
 
-    migration_incoming_state_destroy();
     if (ret < 0) {
         error_setg(errp, "Error %d while loading VM state", ret);
         return ret;