From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXd6i-0002kw-6u for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXd6b-0002dq-Le for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:33 -0500 Received: from [199.232.76.173] (port=38152 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXd6a-0002d7-Fg for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:28 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:57857) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXd6Y-0002dJ-Tk for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:27 -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 756E02DD2F4 for ; Wed, 20 Jan 2010 17:08:23 +0100 (CET) From: Markus Armbruster Date: Wed, 20 Jan 2010 17:08:21 +0100 Message-Id: <1264003702-17329-8-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 7/8] monitor: Use argument type 'T' for migrate_set_downtime() 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 | 15 ++------------- qemu-monitor.hx | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/migration.c b/migration.c index e8802ba..c7763f6 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 20c356a..61b99ba 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -774,7 +774,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, -- 1.6.6