From: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Thu, 5 Nov 2015 18:10:59 +0000 (+0000)
Subject: Avoid sending vmdescription during postcopy
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8421b205ddb70314c0de2aa3222aed755f310f87;p=qmiga%2Fqemu.git

Avoid sending vmdescription during postcopy

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 <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/savevm.c b/migration/savevm.c
index 0e48a919e9..be61eb1e89 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)