motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-01 23:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: Call blk_resume_after_migration() for postcopy

Browse source 
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 <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2017-04-13 18:38:28 +02:00
parent 9fd77f9972
commit 0042fd3663
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
migration/savevm.c
View file

@ -1622,6 +1622,14 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
error_report_err(local_err); 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(); trace_loadvm_postcopy_handle_run_cpu_sync();
cpu_synchronize_all_post_init(); cpu_synchronize_all_post_init();