aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-06-06 19:21:29 +0200
committerJuan Quintela <quintela@redhat.com>2017-06-13 11:00:44 +0200
commitc8f9f4f402dabeec88d2f5e21e54a88021b2eeee (patch)
tree20c31afe862f4d5f8bb5e9e222144350c595dfc2
parent930ac04c22712154a395852c37956156bbbcfd44 (diff)
ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
Merge them. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
-rw-r--r--migration/migration.c14
1 files changed, 1 insertions, 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)