diff options
| author | Fei Li | 2019-01-13 15:08:48 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2019-01-23 16:02:07 +0100 |
| commit | 91b02dc7507f13d81b23ef2d68c1a0673fe32a66 (patch) | |
| tree | 15027479356a9fcdcc7a298f19bd6b7b473830dd /migration | |
| parent | migration: multifd_save_cleanup() can't fail, simplify (diff) | |
| download | qemu-91b02dc7507f13d81b23ef2d68c1a0673fe32a66.tar.gz qemu-91b02dc7507f13d81b23ef2d68c1a0673fe32a66.tar.xz qemu-91b02dc7507f13d81b23ef2d68c1a0673fe32a66.zip | |
migration: add more error handling for postcopy_ram_enable_notify
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 <dgilbert@redhat.com>
Signed-off-by: Fei Li <fli@suse.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190113140849.38339-5-lifei1214@126.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/postcopy-ram.c | 1 | ||||
| -rw-r--r-- | migration/savevm.c | 1 |
2 files changed, 2 insertions, 0 deletions
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; } } |