From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXd6e-0002h3-6B for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXd6Y-0002cK-TT for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:31 -0500 Received: from [199.232.76.173] (port=38146 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXd6Y-0002c4-Nh for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:26 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:57853) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXd6X-0002cX-6I for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:25 -0500 Received: from blackfin.pond.sub.org (pD9E3BC04.dip.t-dialin.net [217.227.188.4]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D274C276D76 for ; Wed, 20 Jan 2010 17:08:22 +0100 (CET) From: Markus Armbruster Date: Wed, 20 Jan 2010 17:08:18 +0100 Message-Id: <1264003702-17329-5-git-send-email-armbru@redhat.com> In-Reply-To: <1264003702-17329-1-git-send-email-armbru@redhat.com> References: <1264003702-17329-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/8] monitor: Use argument type 'b' for migrate_set_speed() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Before, it used type 's', which strips quotes and interprets escapes, and is quite inappropriate for QMP. Signed-off-by: Markus Armbruster --- migration.c | 18 +++--------------- qemu-monitor.hx | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/migration.c b/migration.c index 598f8df..4e7a1ea 100644 --- a/migration.c +++ b/migration.c @@ -109,23 +109,11 @@ void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) void do_migrate_set_speed(Monitor *mon, const QDict *qdict) { double d; - char *ptr; FdMigrationState *s; - const char *value = qdict_get_str(qdict, "value"); - - d = strtod(value, &ptr); - switch (*ptr) { - case 'G': case 'g': - d *= 1024; - case 'M': case 'm': - d *= 1024; - case 'K': case 'k': - d *= 1024; - default: - break; - } - max_throttle = (uint32_t)d; + d = qdict_get_double(qdict, "value"); + d = MAX(0, MIN(INT32_MAX, d)); + max_throttle = d; s = migrate_to_fms(current_migration); if (s && s->file) { diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 415734a..9d2359d 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -761,7 +761,7 @@ ETEXI { .name = "migrate_set_speed", - .args_type = "value:s", + .args_type = "value:b", .params = "value", .help = "set maximum speed (in bytes) for migrations", .mhandler.cmd = do_migrate_set_speed, -- 1.6.6