* Fei Li (fli@suse.com) wrote:
> 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>
> ---
> 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.13.7
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK