From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53973 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P493l-0003mv-Rk for qemu-devel@nongnu.org; Fri, 08 Oct 2010 05:16:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P493k-0000Hu-PO for qemu-devel@nongnu.org; Fri, 08 Oct 2010 05:16:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P493k-0000Hg-IJ for qemu-devel@nongnu.org; Fri, 08 Oct 2010 05:16:12 -0400 From: Jes.Sorensen@redhat.com Date: Fri, 8 Oct 2010 11:15:54 +0200 Message-Id: <1286529360-5715-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1286529360-5715-1-git-send-email-Jes.Sorensen@redhat.com> References: <1286529360-5715-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] Introduce strtosz() library function to convert a string to a byte count. 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 strtosz() returns -1 on error. v2 renamed from strtobytes() to strtosz() as suggested by Markus. Signed-off-by: Jes Sorensen --- cutils.c | 39 +++++++++++++++++++++++++++++++++++++++ qemu-common.h | 1 + vl.c | 31 ++++++++++--------------------- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/cutils.c b/cutils.c index 5883737..ee591c5 100644 --- a/cutils.c +++ b/cutils.c @@ -283,3 +283,42 @@ int fcntl_setfl(int fd, int flag) } #endif +/* + * Convert string to bytes, allowing either K/k for KB, M/m for MB, + * G/g for GB or T/t for TB. Default without any postfix is MB. + * End pointer will be returned in *end, if end is valid. + * Return -1 on error. + */ +ssize_t strtosz(const char *nptr, char **end) +{ + int64_t value; + char *endptr; + + value = strtoll(nptr, &endptr, 0); + switch (*endptr++) { + case 'K': + case 'k': + value <<= 10; + break; + case 0: + case 'M': + case 'm': + value <<= 20; + break; + case 'G': + case 'g': + value <<= 30; + break; + case 'T': + case 't': + value <<= 40; + break; + default: + value = -1; + } + + if (end) + *end = endptr; + + return value; +} diff --git a/qemu-common.h b/qemu-common.h index 81aafa0..0a062d4 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -153,6 +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); /* path.c */ void init_paths(const char *prefix); diff --git a/vl.c b/vl.c index df414ef..6043fa2 100644 --- a/vl.c +++ b/vl.c @@ -734,16 +734,13 @@ static void numa_add(const char *optarg) if (get_param_value(option, 128, "mem", optarg) == 0) { node_mem[nodenr] = 0; } else { - value = strtoull(option, &endptr, 0); - switch (*endptr) { - case 0: case 'M': case 'm': - value <<= 20; - break; - case 'G': case 'g': - value <<= 30; - break; + ssize_t sval; + sval = strtosz(option, NULL); + if (sval < 0) { + fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg); + exit(1); } - node_mem[nodenr] = value; + node_mem[nodenr] = sval; } if (get_param_value(option, 128, "cpus", optarg) == 0) { node_cpumask[nodenr] = 0; @@ -2163,18 +2160,10 @@ int main(int argc, char **argv, char **envp) exit(0); break; case QEMU_OPTION_m: { - uint64_t value; - char *ptr; + ssize_t value; - value = strtoul(optarg, &ptr, 10); - switch (*ptr) { - case 0: case 'M': case 'm': - value <<= 20; - break; - case 'G': case 'g': - value <<= 30; - break; - default: + value = strtosz(optarg, NULL); + if (value < 0) { fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); exit(1); } -- 1.7.2.3