1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Mon, 6 Apr 2020 12:16:52 +0200
4 Subject: [PATCH] PVE: move snapshot cleanup into bottom half
7 (0ceccd858a8d) migration: qemu_savevm_state_cleanup() in cleanup
9 may affect held locks and therefore change assumptions made
12 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
13 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
15 savevm-async.c | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
18 diff --git a/savevm-async.c b/savevm-async.c
19 index 393d55af2a..790e27ae37 100644
22 @@ -201,6 +201,8 @@ static void process_savevm_cleanup(void *opaque)
24 qemu_bh_delete(snap_state.cleanup_bh);
25 snap_state.cleanup_bh = NULL;
26 + qemu_savevm_state_cleanup();
28 qemu_mutex_unlock_iothread();
29 qemu_thread_join(&snap_state.thread);
30 qemu_mutex_lock_iothread();
31 @@ -277,7 +279,6 @@ static void *process_savevm_thread(void *opaque)
32 save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
35 - qemu_savevm_state_cleanup();
36 DPRINTF("save complete\n");