[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-4.0 4/5] migration: add more error handling for
From: |
Fei Li |
Subject: |
[Qemu-devel] [PATCH for-4.0 4/5] migration: add more error handling for postcopy_ram_enable_notify |
Date: |
Sun, 13 Jan 2019 22:08:48 +0800 |
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>
---
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.17.2 (Apple Git-113)
- [Qemu-devel] [PATCH for-4.0 0/5] fix some segmentation faults and migration issues, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 3/5] migration: multifd_save_cleanup() can't fail, simplify, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 1/5] Fix segmentation fault when qemu_signal_init fails, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 5/5] migration: unify error handling for process_incoming_migration_co, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 4/5] migration: add more error handling for postcopy_ram_enable_notify,
Fei Li <=
- [Qemu-devel] [PATCH for-4.0 2/5] migration: fix the multifd code when receiving less channels, Fei Li, 2019/01/13
- Re: [Qemu-devel] [PATCH for-4.0 0/5] fix some segmentation faults and migration issues, Fei Li, 2019/01/15