[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/12] migration: move the units of migrate parameters from millis
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 04/12] migration: move the units of migrate parameters from milliseconds to ms |
Date: |
Thu, 7 May 2020 18:02:03 +0100 |
From: Mao Zhongyi <address@hidden>
Signed-off-by: Mao Zhongyi <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 2 +-
monitor/hmp-cmds.c | 8 ++++----
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);
}
}
--
2.26.2
- [PULL 00/12] migration queue, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 03/12] monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 04/12] migration: move the units of migrate parameters from milliseconds to ms,
Dr. David Alan Gilbert (git) <=
- [PULL 01/12] migration: fix bad indentation in error_report(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 02/12] migration/migration: improve error reporting for migrate parameters, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 06/12] migration/colo: Add missing error-propagation code, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 05/12] docs/devel/migration: start a debugging section, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 07/12] migration/throttle: Add cpu-throttle-tailslow migration parameter, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 08/12] migration/ram: Consolidate variable reset after placement in ram_load_postcopy(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 09/12] migration/rdma: fix a memleak on error path in rdma_start_incoming_migration, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 10/12] migration/xbzrle: add encoding rate, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 11/12] migration/multifd: fix memleaks in multifd_new_send_channel_async, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 12/12] migration/multifd: Do error_free after migrate_set_error to avoid memleaks, Dr. David Alan Gilbert (git), 2020/05/07