From: Kevin Wolf Date: Thu, 13 Apr 2017 16:38:28 +0000 (+0200) Subject: migration: Call blk_resume_after_migration() for postcopy X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0042fd3663662c848aaff5c65b6880e545d94b18;p=qemu.git migration: Call blk_resume_after_migration() for postcopy Commit d35ff5e6 ('block: Ignore guest dev permissions during incoming migration') added blk_resume_after_migration() to the precopy migration path, but neglected to add it to the duplicated code that is used for postcopy migration. This means that the guest device doesn't request the necessary permissions, which ultimately led to failing assertions. Add the missing blk_resume_after_migration() to the postcopy path. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- diff --git a/migration/savevm.c b/migration/savevm.c index 03ae1bdeb4..a00c1ab0af 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1622,6 +1622,14 @@ static void loadvm_postcopy_handle_run_bh(void *opaque) error_report_err(local_err); } + /* If we get an error here, just don't restart the VM yet. */ + blk_resume_after_migration(&local_err); + if (local_err) { + error_free(local_err); + local_err = NULL; + autostart = false; + } + trace_loadvm_postcopy_handle_run_cpu_sync(); cpu_synchronize_all_post_init();