From patchwork Thu Oct 21 15:15:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 68627 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 29546B6F10 for ; Fri, 22 Oct 2010 02:18:58 +1100 (EST) Received: from localhost ([127.0.0.1]:44384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8wut-0001S1-7x for incoming@patchwork.ozlabs.org; Thu, 21 Oct 2010 11:18:55 -0400 Received: from [140.186.70.92] (port=39337 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8ws2-0000Wg-Lv for qemu-devel@nongnu.org; Thu, 21 Oct 2010 11:16:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8ws0-0002XS-Mn for qemu-devel@nongnu.org; Thu, 21 Oct 2010 11:15:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8ws0-0002X2-G8 for qemu-devel@nongnu.org; Thu, 21 Oct 2010 11:15:56 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9LFFsh9005514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Oct 2010 11:15:55 -0400 Received: from red-feather.redhat.com (ovpn-113-20.phx2.redhat.com [10.3.113.20]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9LFFnZk030576; Thu, 21 Oct 2010 11:15:53 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Thu, 21 Oct 2010 17:15:47 +0200 Message-Id: <1287674149-25418-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1287674149-25418-1-git-send-email-Jes.Sorensen@redhat.com> References: <1287674149-25418-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: pbonzini@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/4] Add support for 'o' octet (bytes) format as monitor parameter. 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 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 260cc02..6ef96a2 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 @@ -3703,6 +3708,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': { @@ -4200,6 +4228,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");