From c8f9f4f402dabeec88d2f5e21e54a88021b2eeee Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 6 Jun 2017 19:21:29 +0200 Subject: [PATCH] ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE Merge them. Signed-off-by: Juan Quintela Reviewed-by: Eric Blake Reviewed-by: Peter Xu Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier --- migration/migration.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 2f5f2707b6..b23dfd3e25 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -653,20 +653,8 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_CANCELLING: - info->has_status = true; - info->has_total_time = true; - info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - - s->total_time; - info->has_expected_downtime = true; - info->expected_downtime = s->expected_downtime; - info->has_setup_time = true; - info->setup_time = s->setup_time; - - populate_ram_info(info, s); - populate_disk_info(info); - break; case MIGRATION_STATUS_POSTCOPY_ACTIVE: - /* Mostly the same as active; TODO add some postcopy stats */ + /* TODO add some postcopy stats */ info->has_status = true; info->has_total_time = true; info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)