aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMao Zhongyi <maozhongyi@cmss.chinamobile.com>2020-03-31 16:22:07 +0800
committerDr. David Alan Gilbert <dgilbert@redhat.com>2020-05-07 17:40:24 +0100
commit7ac5529afba7b4e9c4d9d1cbeb2b607208af97c1 (patch)
tree2e57bf72a323980aa2e1f3e1c1382330d24b55c7
parentf96c6a8736517af2a2d9e1fae3c1368d5b9adc4a (diff)
migration: move the units of migrate parameters from milliseconds to ms
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Message-Id: <474bb6cf67defb8be9de5035c11aee57a680557a.1585641083.git.maozhongyi@cmss.chinamobile.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-rw-r--r--migration/migration.c2
-rw-r--r--monitor/hmp-cmds.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 6e079efdcc..79f16f6625 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1214,7 +1214,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"downtime_limit",
"an integer in the range of 0 to "
- stringify(MAX_MIGRATE_DOWNTIME)" milliseconds");
+ stringify(MAX_MIGRATE_DOWNTIME)" ms");
return false;
}
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 9bb6946fbf..1552dee489 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -231,18 +231,18 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "\n");
}
- monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
+ monitor_printf(mon, "total time: %" PRIu64 " ms\n",
info->total_time);
if (info->has_expected_downtime) {
- monitor_printf(mon, "expected downtime: %" PRIu64 " milliseconds\n",
+ monitor_printf(mon, "expected downtime: %" PRIu64 " ms\n",
info->expected_downtime);
}
if (info->has_downtime) {
- monitor_printf(mon, "downtime: %" PRIu64 " milliseconds\n",
+ monitor_printf(mon, "downtime: %" PRIu64 " ms\n",
info->downtime);
}
if (info->has_setup_time) {
- monitor_printf(mon, "setup: %" PRIu64 " milliseconds\n",
+ monitor_printf(mon, "setup: %" PRIu64 " ms\n",
info->setup_time);
}
}