From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9se-00049M-Tp for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:26:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw9se-0000v2-8J for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:26:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9se-0000uq-3n for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:26:40 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id D5271A37E4 for ; Tue, 10 Nov 2015 14:26:39 +0000 (UTC) From: Juan Quintela Date: Tue, 10 Nov 2015 15:25:21 +0100 Message-Id: <1447165546-27784-33-git-send-email-quintela@redhat.com> In-Reply-To: <1447165546-27784-1-git-send-email-quintela@redhat.com> References: <1447165546-27784-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 32/57] Avoid sending vmdescription during postcopy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com From: "Dr. David Alan Gilbert" VMDescription is normally sent at the end, after all of the devices; however that's not the end for postcopy, so just don't send it when in postcopy. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Reviewed-by: Amit Shah Signed-off-by: Juan Quintela --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 0e48a91..be61eb1 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -974,7 +974,8 @@ int qemu_savevm_state_iterate(QEMUFile *f) static bool should_send_vmdesc(void) { MachineState *machine = MACHINE(qdev_get_machine()); - return !machine->suppress_vmdesc; + bool in_postcopy = migration_in_postcopy(migrate_get_current()); + return !machine->suppress_vmdesc && !in_postcopy; } void qemu_savevm_state_complete_precopy(QEMUFile *f) -- 2.5.0