From patchwork Wed Oct 13 07:20:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 67647 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C4440B70B8 for ; Wed, 13 Oct 2010 18:26:14 +1100 (EST) Received: from localhost ([127.0.0.1]:53089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5vj0-0003Iw-6j for incoming@patchwork.ozlabs.org; Wed, 13 Oct 2010 03:26:10 -0400 Received: from [140.186.70.92] (port=45721 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5ve2-0001hv-34 for qemu-devel@nongnu.org; Wed, 13 Oct 2010 03:21:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5ve1-00082W-4s for qemu-devel@nongnu.org; Wed, 13 Oct 2010 03:21:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57927) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5ve0-00082O-TA for qemu-devel@nongnu.org; Wed, 13 Oct 2010 03:21:01 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9D7Kwrj007095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Oct 2010 03:20:58 -0400 Received: from localhost6.localdomain6 (ovpn-113-72.phx2.redhat.com [10.3.113.72]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9D7KqDD011740; Wed, 13 Oct 2010 03:20:57 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Wed, 13 Oct 2010 09:20:49 +0200 Message-Id: <1286954450-30860-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1286954450-30860-1-git-send-email-Jes.Sorensen@redhat.com> References: <1286954450-30860-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: pbonzini@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 3/4] Switch migrate_set_speed() to take an 'o' argument rather than a float. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;