diff mbox

[PULL,32/57] Avoid sending vmdescription during postcopy

Message ID 1447165546-27784-33-git-send-email-quintela@redhat.com
State New
Headers show

Commit Message

Juan Quintela Nov. 10, 2015, 2:25 p.m. UTC 
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

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>
---
 migration/savevm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

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)