Re: [Qemu-devel] [PATCH v2 2/2] ram: Now POSTCOPY_ACTIVE is the same that STATUS_ACTIVE

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Merge them.
> 
> Signed-off-by: Juan Quintela <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  migration/migration.c | 14 +-------------
>  1 file changed, 1 insertion(+), 13 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index cfa266b..b31a195 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -541,20 +541,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)
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK