From patchwork Mon Jan 25 13:23:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 43627 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 67884B7C09 for ; Tue, 26 Jan 2010 00:35:42 +1100 (EST) Received: from localhost ([127.0.0.1]:37202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZP4s-0001wc-7X for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2010 08:34:02 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOuZ-00011l-1h for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOuS-0000uo-QD for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:20 -0500 Received: from [199.232.76.173] (port=42844 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOuR-0000uL-LZ for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:16 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:60573) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZOuQ-0003U5-R4 for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:15 -0500 Received: from blackfin.pond.sub.org (pD9E3A875.dip.t-dialin.net [217.227.168.117]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 671DF2E2AF4 for ; Mon, 25 Jan 2010 14:22:57 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 5D04542B; Mon, 25 Jan 2010 14:23:09 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2010 14:23:07 +0100 Message-Id: <1264425788-8245-8-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1264425788-8245-1-git-send-email-armbru@redhat.com> References: <1264425788-8245-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH v3 7/8] monitor: Use argument type 'T' for migrate_set_downtime 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 Before, it used type 's', which strips quotes and interprets escapes, and is quite inappropriate for QMP. Negative arguments are no flushed to zero. Before, they were cast to uint32_t, which wrecked the sign. Ridiculously large arguments including infinities are now rejected. Before, they were interpreted as zero. Same for NaN. Signed-off-by: Markus Armbruster --- migration.c | 15 ++------------- qemu-monitor.hx | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/migration.c b/migration.c index cd8d9e6..7551953 100644 --- a/migration.c +++ b/migration.c @@ -134,21 +134,10 @@ uint64_t migrate_max_downtime(void) void do_migrate_set_downtime(Monitor *mon, const QDict *qdict) { - char *ptr; double d; - const char *value = qdict_get_str(qdict, "value"); - - d = strtod(value, &ptr); - if (!strcmp(ptr,"ms")) { - d *= 1000000; - } else if (!strcmp(ptr,"us")) { - d *= 1000; - } else if (!strcmp(ptr,"ns")) { - } else { - /* all else considered to be seconds */ - d *= 1000000000; - } + d = qdict_get_double(qdict, "value") * 1e9; + d = MAX(0, MIN(UINT64_MAX, d)); max_downtime = (uint64_t)d; } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 2354e4f..9257d9c 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -775,7 +775,7 @@ ETEXI { .name = "migrate_set_downtime", - .args_type = "value:s", + .args_type = "value:T", .params = "value", .help = "set maximum tolerated downtime (in seconds) for migrations", .mhandler.cmd = do_migrate_set_downtime,