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-0002ky-9j 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-0002dg-Jx for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:34 -0500 Received: from [199.232.76.173] (port=38156 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXd6a-0002dK-FT for qemu-devel@nongnu.org; Wed, 20 Jan 2010 11:08:28 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:57856) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXd6Z-0002dH-A9 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 73F762DD2F3 for ; Wed, 20 Jan 2010 17:08:23 +0100 (CET) From: Markus Armbruster Date: Wed, 20 Jan 2010 17:08:20 +0100 Message-Id: <1264003702-17329-7-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 6/8] monitor: New argument type 'T' List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index ce97e7b..6dafe0b 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 '/') @@ -3544,6 +3547,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, } break; case 'b': + case 'T': { double val; @@ -3558,7 +3562,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; @@ -3568,6 +3572,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; -- 1.6.6