[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] migration: add more error handling for postcopy_
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 4/9] migration: add more error handling for postcopy_ram_enable_notify |
Date: |
Wed, 23 Jan 2019 15:58:25 +0000 |
From: Fei Li <address@hidden>
Call postcopy_ram_incoming_cleanup() to do the cleanup when
postcopy_ram_enable_notify fails. Besides, report the error
message when qemu_ram_foreach_migratable_block() fails.
Cc: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/postcopy-ram.c | 1 +
migration/savevm.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index e5c02a32c5..fa09dba534 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1117,6 +1117,7 @@ int postcopy_ram_enable_notify(MigrationIncomingState
*mis)
/* Mark so that we get notified of accesses to unwritten areas */
if (qemu_ram_foreach_migratable_block(ram_block_enable_notify, mis)) {
+ error_report("ram_block_enable_notify failed");
return -1;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index 9e45fb4f3f..d784e8aa40 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1729,6 +1729,7 @@ static int
loadvm_postcopy_handle_listen(MigrationIncomingState *mis)
*/
if (migrate_postcopy_ram()) {
if (postcopy_ram_enable_notify(mis)) {
+ postcopy_ram_incoming_cleanup(mis);
return -1;
}
}
--
2.20.1
- [Qemu-devel] [PULL 0/9] migration queue, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 1/9] Fix segmentation fault when qemu_signal_init fails, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 2/9] migration: fix the multifd code when receiving less channels, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 3/9] migration: multifd_save_cleanup() can't fail, simplify, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 4/9] migration: add more error handling for postcopy_ram_enable_notify,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 5/9] migration: unify error handling for process_incoming_migration_co, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 6/9] migration/rdma: unregister fd handler, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 7/9] tests: add /vmstate/simple/array, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 8/9] vmstate: constify SaveVMHandlers, Dr. David Alan Gilbert (git), 2019/01/23
- [Qemu-devel] [PULL 9/9] migration: introduce pages-per-second, Dr. David Alan Gilbert (git), 2019/01/23
- Re: [Qemu-devel] [PULL 0/9] migration queue, Peter Maydell, 2019/01/24