Signed-off-by: Juan Quintela <quint...@redhat.com> --- hmp.c | 4 ++++ migration.c | 5 ++++- migration.h | 1 + qapi-schema.json | 6 +++++- 4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hmp.c b/hmp.c index c0b0a10..10fee1b 100644 --- a/hmp.c +++ b/hmp.c @@ -151,6 +151,10 @@ void hmp_info_migrate(Monitor *mon) monitor_printf(mon, "Migration status: %s\n", info->status); monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n", info->total_time); + if (strcmp(info->status, "completed") == 0) { + monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n", + info->downtime); + } } if (info->has_ram) { diff --git a/migration.c b/migration.c index 159728d..4c2ac6c 100644 --- a/migration.c +++ b/migration.c @@ -194,6 +194,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->has_status = true; info->status = g_strdup("completed"); info->total_time = s->total_time; + info->downtime = s->downtime; info->has_ram = true; info->ram = g_malloc0(sizeof(*info->ram)); @@ -326,9 +327,10 @@ static void migrate_fd_put_ready(void *opaque) migrate_fd_error(s); } else if (ret == 1) { int old_vm_running = runstate_is_running(); - int64_t end_time; + int64_t start_time, end_time; DPRINTF("done iterating\n"); + start_time = qemu_get_clock_ms(rt_clock); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); @@ -339,6 +341,7 @@ static void migrate_fd_put_ready(void *opaque) } end_time = qemu_get_clock_ms(rt_clock); s->total_time = end_time - s->total_time; + s->downtime = end_time - start_time; if (s->state != MIG_STATE_COMPLETED) { if (old_vm_running) { vm_start(); diff --git a/migration.h b/migration.h index a9852fc..3462917 100644 --- a/migration.h +++ b/migration.h @@ -40,6 +40,7 @@ struct MigrationState void *opaque; MigrationParams params; int64_t total_time; + int64_t downtime; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; }; diff --git a/qapi-schema.json b/qapi-schema.json index 907051a..6df1ce3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -319,13 +319,17 @@ # If migration has ended, it returns the total migration # time. (since 1.2) # +# @downtime: total downtime in milliseconds for the guest. +# (since 1.2) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', 'data': {'*status': 'str', '*ram': 'MigrationStats', '*disk': 'MigrationStats', '*xbzrle-cache': 'XBZRLECacheStats', - 'total-time': 'int'} } + 'total-time': 'int', + 'downtime': 'int'} } ## # @query-migrate -- 1.7.11.2