From patchwork Mon Jan 25 13:23:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 43629 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 7342C1007D2 for ; Tue, 26 Jan 2010 00:39:47 +1100 (EST) Received: from localhost ([127.0.0.1]:39481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZP8d-0006tG-3d for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2010 08:37:55 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOuZ-00011u-7R 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-0000uX-Jr for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:20 -0500 Received: from [199.232.76.173] (port=42843 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOuR-0000u4-D8 for qemu-devel@nongnu.org; Mon, 25 Jan 2010 08:23:15 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:60575) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZOuQ-0003UB-R3 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 697D22E2AF6 for ; Mon, 25 Jan 2010 14:22:57 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 5380E42D; Mon, 25 Jan 2010 14:23:09 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 25 Jan 2010 14:23:06 +0100 Message-Id: <1264425788-8245-7-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 6/8] monitor: New argument type 'T' 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 This is a double value with optional suffixes ms, us, ns. We'll need this to get migrate_set_downtime() QMP-ready. Signed-off-by: Markus Armbruster --- monitor.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index 6325404..a9d0c8a 100644 --- a/monitor.c +++ b/monitor.c @@ -75,6 +75,9 @@ * user mode accepts an optional G, g, M, m, K, k suffix, * which multiplies the value by 2^30 for suffixes G and * g, 2^20 for M and m, 2^10 for K and k + * 'T' double + * user mode accepts an optional ms, us, ns suffix, + * which divides the value by 1e3, 1e6, 1e9, respectively * '/' optional gdb-like print format (like "/10x") * * '?' optional type (for all types, except '/') @@ -3543,6 +3546,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, } break; case 'b': + case 'T': { double val; @@ -3557,7 +3561,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, if (get_double(mon, &val, &p) < 0) { goto fail; } - if (*p) { + if (c == 'b' && *p) { switch (*p) { case 'K': case 'k': val *= 1 << 10; p++; break; @@ -3567,6 +3571,16 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, val *= 1 << 30; p++; break; } } + if (c == 'T' && p[0] && p[1] == 's') { + switch (*p) { + case 'm': + val /= 1e3; p += 2; break; + case 'u': + val /= 1e6; p += 2; break; + case 'n': + val /= 1e9; p += 2; break; + } + } if (*p && !qemu_isspace(*p)) { monitor_printf(mon, "Unknown unit suffix\n"); goto fail; @@ -3981,6 +3995,7 @@ static int check_arg(const CmdArgs *cmd_args, QDict *args) } break; case 'b': + case 'T': if (qobject_type(value) != QTYPE_QINT && qobject_type(value) != QTYPE_QFLOAT) { qemu_error_new(QERR_INVALID_PARAMETER_TYPE, name, "number"); return -1;