From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33660 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P602B-000683-V8 for qemu-devel@nongnu.org; Wed, 13 Oct 2010 08:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5x19-0004wH-JX for qemu-devel@nongnu.org; Wed, 13 Oct 2010 04:49:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5x19-0004w6-Cz for qemu-devel@nongnu.org; Wed, 13 Oct 2010 04:48:59 -0400 From: Jes.Sorensen@redhat.com Date: Wed, 13 Oct 2010 10:48:48 +0200 Message-Id: <1286959730-924-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1286959730-924-1-git-send-email-Jes.Sorensen@redhat.com> References: <1286959730-924-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] Add support for 'o' octet (bytes) format as monitor parameter. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com From: Jes Sorensen Octet format relies on strtosz which supports K/k, M/m, G/g, T/t suffixes and unit support for humans, like 1.3G Signed-off-by: Jes Sorensen --- monitor.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index fbb678d..b0ea5a3 100644 --- a/monitor.c +++ b/monitor.c @@ -78,6 +78,11 @@ * 'l' target long (32 or 64 bit) * 'M' just like 'l', except in user mode the value is * multiplied by 2^20 (think Mebibyte) + * 'o' octets (aka bytes) + * user mode accepts an optional T, t, G, g, M, m, K, k + * suffix, which multiplies the value by 2^40 for + * suffixes T and t, 2^30 for suffixes G and g, 2^20 for + * M and m, 2^10 for K and k * 'f' double * user mode accepts an optional G, g, M, m, K, k suffix, * which multiplies the value by 2^30 for suffixes G and @@ -3699,6 +3704,29 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, qdict_put(qdict, key, qint_from_int(val)); } break; + case 'o': + { + ssize_t val; + char *end; + + while (qemu_isspace(*p)) { + p++; + } + if (*typestr == '?') { + typestr++; + if (*p == '\0') { + break; + } + } + val = strtosz(p, &end); + if (val < 0) { + monitor_printf(mon, "invalid size\n"); + goto fail; + } + qdict_put(qdict, key, qint_from_int(val)); + p = end; + } + break; case 'f': case 'T': { @@ -4196,6 +4224,7 @@ static int check_client_args_type(const QDict *client_args, case 'i': case 'l': case 'M': + case 'o': if (qobject_type(client_arg) != QTYPE_QINT) { qerror_report(QERR_INVALID_PARAMETER_TYPE, client_arg_name, "int"); -- 1.7.2.3