Skip to content

Commit

Permalink
ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juan Quintela committed Jun 13, 2017
1 parent 930ac04 commit c8f9f4f
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions migration/migration.c
Expand Up @@ -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)
Expand Down

0 comments on commit c8f9f4f

Please sign in to comment.