summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. David Alan Gilbert2015-11-05 19:10:59 +0100
committerJuan Quintela2015-11-10 15:00:26 +0100
commit8421b205ddb70314c0de2aa3222aed755f310f87 (patch)
treeb24ff8420b6a1bc9f4bb7082b582d7e167690092
parentMIGRATION_STATUS_POSTCOPY_ACTIVE: Add new migration state (diff)
downloadqemu-8421b205ddb70314c0de2aa3222aed755f310f87.tar.gz
qemu-8421b205ddb70314c0de2aa3222aed755f310f87.tar.xz
qemu-8421b205ddb70314c0de2aa3222aed755f310f87.zip
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>
-rw-r--r--migration/savevm.c3
1 files changed, 2 insertions, 1 deletions
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)