From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIA3I-0007Ye-Fx for qemu-devel@nongnu.org; Thu, 01 Nov 2018 06:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIA3C-00081O-Ck for qemu-devel@nongnu.org; Thu, 01 Nov 2018 06:18:12 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:39130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIA3C-00080y-2w for qemu-devel@nongnu.org; Thu, 01 Nov 2018 06:18:06 -0400 From: Fei Li Date: Thu, 1 Nov 2018 18:17:14 +0800 Message-Id: <20181101101715.9443-9-fli@suse.com> In-Reply-To: <20181101101715.9443-1-fli@suse.com> References: <20181101101715.9443-1-fli@suse.com> Subject: [Qemu-devel] [PATCH RFC v7 8/9] migration: add more error handling for postcopy_ram_enable_notify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com, famz@redhat.com, peterx@redhat.com, quintela@redhat.com 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 Signed-off-by: Fei Li --- 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 9992af4db4..f2644586de 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1725,6 +1725,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