From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 6 Apr 2020 12:16:52 +0200 Subject: [PATCH] PVE: move snapshot cleanup into bottom half as per: (0ceccd858a8d) migration: qemu_savevm_state_cleanup() in cleanup may affect held locks and therefore change assumptions made by that function! Signed-off-by: Wolfgang Bumiller Signed-off-by: Thomas Lamprecht --- savevm-async.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/savevm-async.c b/savevm-async.c index 393d55af2a..790e27ae37 100644 --- a/savevm-async.c +++ b/savevm-async.c @@ -201,6 +201,8 @@ static void process_savevm_cleanup(void *opaque) int ret; qemu_bh_delete(snap_state.cleanup_bh); snap_state.cleanup_bh = NULL; + qemu_savevm_state_cleanup(); + qemu_mutex_unlock_iothread(); qemu_thread_join(&snap_state.thread); qemu_mutex_lock_iothread(); @@ -277,7 +279,6 @@ static void *process_savevm_thread(void *opaque) save_snapshot_error("qemu_savevm_state_iterate error %d", ret); break; } - qemu_savevm_state_cleanup(); DPRINTF("save complete\n"); break; }