From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgqRZ-0006BC-AP for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:39:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgqRY-0002E7-F1 for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:39:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgqRY-0002E0-AI for qemu-devel@nongnu.org; Tue, 29 Sep 2015 04:39:24 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 29 Sep 2015 09:37:54 +0100 Message-Id: <1443515898-3594-31-git-send-email-dgilbert@redhat.com> In-Reply-To: <1443515898-3594-1-git-send-email-dgilbert@redhat.com> References: <1443515898-3594-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v8 30/54] Avoid sending vmdescription during postcopy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: aarcange@redhat.com, pbonzini@redhat.com, liang.z.li@intel.com, luis@cs.umu.se, bharata@linux.vnet.ibm.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 --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index c065ae8..5a98bb4 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