From patchwork Thu Oct 7 16:03:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 67073 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 A55FCB70A3 for ; Fri, 8 Oct 2010 03:09:43 +1100 (EST) Received: from localhost ([127.0.0.1]:50345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3t2F-0000iW-K1 for incoming@patchwork.ozlabs.org; Thu, 07 Oct 2010 12:09:35 -0400 Received: from [140.186.70.92] (port=41136 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3sww-0005lD-O7 for qemu-devel@nongnu.org; Thu, 07 Oct 2010 12:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3swv-00057f-4e for qemu-devel@nongnu.org; Thu, 07 Oct 2010 12:04:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3swu-00057V-OF for qemu-devel@nongnu.org; Thu, 07 Oct 2010 12:04:05 -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 o97G42La009374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Oct 2010 12:04:02 -0400 Received: from yakj.usersys.redhat.com (dhcp-27-206.brq.redhat.com [10.34.27.206]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o97G3vCB008202; Thu, 7 Oct 2010 12:03:58 -0400 Message-ID: <4CADEF6D.3010706@redhat.com> Date: Thu, 07 Oct 2010 18:03:57 +0200 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100907 Fedora/3.1.3-1.fc13 Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.3 MIME-Version: 1.0 To: Jes.Sorensen@redhat.com References: <1286463710-28262-1-git-send-email-Jes.Sorensen@redhat.com> <1286463710-28262-6-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1286463710-28262-6-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: qemu-devel@nongnu.org, armbru@redhat.com Subject: [Qemu-devel] Re: [PATCH 5/6] Switch migrate_set_speed() to take an 'o' argument rather than a float. 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 On 10/07/2010 05:01 PM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > Signed-off-by: Jes Sorensen > --- > hmp-commands.hx | 2 +- > migration.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 81999aa..95bdb91 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -754,7 +754,7 @@ ETEXI > > { > .name = "migrate_set_speed", > - .args_type = "value:f", > + .args_type = "value:o", > .params = "value", > .help = "set maximum speed (in bytes) for migrations", ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Is this still accurate? Alternatively, you said it's a mess to distinguish the defaults on the command line and the monitor, but is it harder than the attached patch? Paolo diff --git a/cutils.c b/cutils.c index 012eb11..4a9ce0f 100644 --- a/cutils.c +++ b/cutils.c @@ -289,13 +289,13 @@ int fcntl_setfl(int fd, int flag) * End pointer will be returned in *end, if end is valid. * Return -1 on error. */ -ssize_t strtosz(const char *nptr, char **end) +ssize_t strtosz(const char *nptr, char **end, int default_shift) { ssize_t retval = -1; - int64_t tmpval; + int64_t tmpval, mul; char *endptr; int mul_required = 0; - double val, mul = 1; + double val; endptr = (char *)nptr + strspn(nptr, " 0123456789"); if (*endptr == '.') { @@ -308,15 +308,14 @@ ssize_t strtosz(const char *nptr, char **end) goto fail; switch (*endptr++) { + case 0: + case ' ': + mul = (1ULL << default_shift); + break; case 'K': case 'k': mul = 1 << 10; break; - case 0: - case ' ': - if (mul_required) { - goto fail; - } case 'M': case 'm': mul = 1ULL << 20; @@ -333,6 +332,9 @@ ssize_t strtosz(const char *nptr, char **end) goto fail; } + if (mul == 1 && mul_required) { + goto fail; + } tmpval = (val * mul); if (tmpval > ~(size_t)0) goto fail; diff --git a/monitor.c b/monitor.c index 6678fb5..0d04b27 100644 --- a/monitor.c +++ b/monitor.c @@ -3713,7 +3713,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, break; } } - val = strtosz(p, &end); + val = strtosz(p, &end, 0); if (val < 0) { monitor_printf(mon, "invalid size\n"); goto fail; diff --git a/qemu-common.h b/qemu-common.h index 0a062d4..cabd8f8 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -153,7 +153,7 @@ time_t mktimegm(struct tm *tm); int qemu_fls(int i); int qemu_fdatasync(int fd); int fcntl_setfl(int fd, int flag); -ssize_t strtosz(const char *nptr, char **end); +ssize_t strtosz(const char *nptr, char **end, int default_shift); /* path.c */ void init_paths(const char *prefix); diff --git a/vl.c b/vl.c index 6043fa2..ae4d6f3 100644 --- a/vl.c +++ b/vl.c @@ -735,7 +735,7 @@ static void numa_add(const char *optarg) node_mem[nodenr] = 0; } else { ssize_t sval; - sval = strtosz(option, NULL); + sval = strtosz(option, NULL, 20); if (sval < 0) { fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg); exit(1); @@ -2162,7 +2162,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_m: { ssize_t value; - value = strtosz(optarg, NULL); + value = strtosz(optarg, NULL, 20); if (value < 0) { fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); exit(1);