From patchwork Thu Sep 16 14:52:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 64983 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 250C2B70EB for ; Fri, 17 Sep 2010 02:53:33 +1000 (EST) Received: from localhost ([127.0.0.1]:35099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwGWN-00046X-JY for incoming@patchwork.ozlabs.org; Thu, 16 Sep 2010 11:37:12 -0400 Received: from [140.186.70.92] (port=43501 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwGG9-00063D-Ty for qemu-devel@nongnu.org; Thu, 16 Sep 2010 11:20:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwFpG-0006rF-RV for qemu-devel@nongnu.org; Thu, 16 Sep 2010 10:52:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54666) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwFpG-0006rA-K9 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 10:52:38 -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 o8GEqa8t002647 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Sep 2010 10:52:37 -0400 Received: from localhost6.localdomain6 (ovpn-113-72.phx2.redhat.com [10.3.113.72]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8GEqVFd027556; Thu, 16 Sep 2010 10:52:36 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Thu, 16 Sep 2010 16:52:27 +0200 Message-Id: <1284648749-18479-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1284648749-18479-1-git-send-email-Jes.Sorensen@redhat.com> References: <1284648749-18479-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 Subject: [Qemu-devel] [PATCH 3/5] 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 strtobytes 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 | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index e602480..3630061 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 @@ -3594,6 +3599,28 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, qdict_put(qdict, key, qint_from_int(val)); } break; + case 'o': + { + int64_t val; + char *end; + + while (qemu_isspace(*p)) + p++; + if (*typestr == '?') { + typestr++; + if (*p == '\0') { + break; + } + } + val = strtobytes(p, &end); + if (!val) { + monitor_printf(mon, "invalid size\n"); + goto fail; + } + qdict_put(qdict, key, qint_from_int(val)); + p = end; + } + break; case 'f': case 'T': {