From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, david@redhat.com, zhukeqian1@huawei.com,
maozhongyi@cmss.chinamobile.com, marcandre.lureau@redhat.com,
pannengyuan@huawei.com, f4bug@amsat.org, wei.w.wang@intel.com,
yi.y.sun@intel.com, quintela@redhat.com
Subject: [PULL 04/12] migration: move the units of migrate parameters from milliseconds to ms
Date: Thu, 7 May 2020 18:02:03 +0100 [thread overview]
Message-ID: <20200507170211.238283-5-dgilbert@redhat.com> (raw)
In-Reply-To: <20200507170211.238283-1-dgilbert@redhat.com>
From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
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>
---
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
next prev parent reply other threads:[~2020-05-07 17:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 17:01 [PULL 00/12] migration queue Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 01/12] migration: fix bad indentation in error_report() Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 02/12] migration/migration: improve error reporting for migrate parameters Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 03/12] monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed() Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` Dr. David Alan Gilbert (git) [this message]
2020-05-07 17:02 ` [PULL 05/12] docs/devel/migration: start a debugging section Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 06/12] migration/colo: Add missing error-propagation code Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 07/12] migration/throttle: Add cpu-throttle-tailslow migration parameter Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 08/12] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 09/12] migration/rdma: fix a memleak on error path in rdma_start_incoming_migration Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 10/12] migration/xbzrle: add encoding rate Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 11/12] migration/multifd: fix memleaks in multifd_new_send_channel_async Dr. David Alan Gilbert (git)
2020-05-07 17:02 ` [PULL 12/12] migration/multifd: Do error_free after migrate_set_error to avoid memleaks Dr. David Alan Gilbert (git)
2020-05-07 18:49 ` [PULL 00/12] migration queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507170211.238283-5-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=david@redhat.com \
--cc=f4bug@amsat.org \
--cc=maozhongyi@cmss.chinamobile.com \
--cc=marcandre.lureau@redhat.com \
--cc=pannengyuan@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=wei.w.wang@intel.com \
--cc=yi.y.sun@intel.com \
--cc=zhukeqian1@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).