[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/34] migration: Call blk_resume_after_migration() f
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 06/34] migration: Call blk_resume_after_migration() for postcopy |
Date: |
Fri, 28 Apr 2017 22:33:14 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
migration/savevm.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/migration/savevm.c b/migration/savevm.c
index 03ae1bd..a00c1ab 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();
--
1.8.3.1
- [Qemu-devel] [PULL 00/34] Block layer patches, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 02/34] file-posix: Remove unnecessary includes, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 01/34] block: Constify data passed by pointer to blk_name, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 03/34] file-win32: Remove unnecessary include, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 04/34] Revert "block/io: Comment out permission assertions", Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 06/34] migration: Call blk_resume_after_migration() for postcopy,
Kevin Wolf <=
- [Qemu-devel] [PULL 05/34] qemu-img: simplify img_convert, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 08/34] qemu-iotests: Test postcopy migration, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 10/34] iotests/051: Add test for empty filename, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 09/34] block: An empty filename counts as no filename, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 11/34] qemu-iotests: Remove PERL_PROG and BC_PROG, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 12/34] qemu_iotests: Remove _readlink(), Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 13/34] block: Remove NULL check in bdrv_co_flush, Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 15/34] Issue a deprecation warning if the user specifies the "-hdachs" option., Kevin Wolf, 2017/04/28
- [Qemu-devel] [PULL 14/34] iotests: Launch qemu-nbd with -e 42, Kevin Wolf, 2017/04/28