From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34175 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P602B-0006TA-RH for qemu-devel@nongnu.org; Wed, 13 Oct 2010 08:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5x1A-0004wl-Ta for qemu-devel@nongnu.org; Wed, 13 Oct 2010 04:49:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5x1A-0004wc-Na for qemu-devel@nongnu.org; Wed, 13 Oct 2010 04:49:00 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 13 Oct 2010 10:48:49 +0200 Message-Id: <1286959730-924-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1286959730-924-1-git-send-email-Jes.Sorensen@redhat.com> References: <1286959730-924-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] Switch migrate_set_speed() to take an 'o' argument rather than a float. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com From: Jes Sorensen Clarify default value of MB in migration speed argument in monitor, if no suffix is specified. This differ from previous default of bytes, but is consistent with the rest of the places where we accept a size argument. Signed-off-by: Jes Sorensen --- hmp-commands.hx | 5 +++-- migration.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 81999aa..e5585ba 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -754,9 +754,10 @@ ETEXI { .name = "migrate_set_speed", - .args_type = "value:f", + .args_type = "value:o", .params = "value", - .help = "set maximum speed (in bytes) for migrations", + .help = "set maximum speed (in bytes) for migrations. " + "Defaults to MB if no size suffix is specified, ie. B/K/M/G/T", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate_set_speed, }, diff --git a/migration.c b/migration.c index 468d517..9ee8b17 100644 --- a/migration.c +++ b/migration.c @@ -132,10 +132,10 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) { - double d; + int64_t d; FdMigrationState *s; - d = qdict_get_double(qdict, "value"); + d = qdict_get_int(qdict, "value"); d = MAX(0, MIN(UINT32_MAX, d)); max_throttle = d; -- 1.7.2.3