From nobody Mon Feb 9 04:59:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487068920805634.7756584174579; Tue, 14 Feb 2017 02:42:00 -0800 (PST) Received: from localhost ([::1]:33774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdaYZ-0003EY-GV for importer@patchew.org; Tue, 14 Feb 2017 05:41:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdaJR-0005r9-3P for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdaJN-0003OC-W0 for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdaJN-0003NF-Nf for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:26:17 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E2BDD19D241 for ; Tue, 14 Feb 2017 10:26:17 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1EAQGC0023214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 14 Feb 2017 05:26:17 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A845D11384BC; Tue, 14 Feb 2017 11:26:11 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 11:26:02 +0100 Message-Id: <1487067971-10443-16-git-send-email-armbru@redhat.com> In-Reply-To: <1487067971-10443-1-git-send-email-armbru@redhat.com> References: <1487067971-10443-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 14 Feb 2017 10:26:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 15/24] util/cutils: Rename qemu_strtosz() to qemu_strtosz_mebi() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" With qemu_strtosz(), no suffix means mebibytes. It's used rarely. I'm going to add a similar function where no suffix means bytes. Rename qemu_strtosz() to qemu_strtosz_mebi() to make the name qemu_strtosz() available for the new function. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- hmp.c | 2 +- hw/misc/ivshmem.c | 2 +- include/qemu/cutils.h | 2 +- monitor.c | 2 +- tests/test-cutils.c | 38 +++++++++++++++++++------------------- util/cutils.c | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/hmp.c b/hmp.c index 2bc4f06..6d0d05b 100644 --- a/hmp.c +++ b/hmp.c @@ -1379,7 +1379,7 @@ void hmp_migrate_set_parameter(Monitor *mon, const QD= ict *qdict) break; case MIGRATION_PARAMETER_MAX_BANDWIDTH: p.has_max_bandwidth =3D true; - valuebw =3D qemu_strtosz(valuestr, &endp); + valuebw =3D qemu_strtosz_mebi(valuestr, &endp); if (valuebw < 0 || (size_t)valuebw !=3D valuebw || *endp !=3D '\0') { error_setg(&err, "Invalid size %s", valuestr); diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index bf57e63..382dd8b 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1268,7 +1268,7 @@ static void ivshmem_realize(PCIDevice *dev, Error **e= rrp) s->legacy_size =3D 4 << 20; /* 4 MB default */ } else { char *end; - int64_t size =3D qemu_strtosz(s->sizearg, &end); + int64_t size =3D qemu_strtosz_mebi(s->sizearg, &end); if (size < 0 || (size_t)size !=3D size || *end !=3D '\0' || !is_power_of_2(size)) { error_setg(errp, "Invalid size %s", s->sizearg); diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 81613d0..5f4e138 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -153,9 +153,9 @@ int parse_uint_full(const char *s, unsigned long long *= value, int base); #define QEMU_STRTOSZ_DEFSUFFIX_MB 'M' #define QEMU_STRTOSZ_DEFSUFFIX_KB 'K' #define QEMU_STRTOSZ_DEFSUFFIX_B 'B' -int64_t qemu_strtosz(const char *nptr, char **end); int64_t qemu_strtosz_suffix(const char *nptr, char **end, const char default_suffix); +int64_t qemu_strtosz_mebi(const char *nptr, char **end); int64_t qemu_strtosz_metric(const char *nptr, char **end); =20 #define K_BYTE (1ULL << 10) diff --git a/monitor.c b/monitor.c index 3cd72a9..1f8c031 100644 --- a/monitor.c +++ b/monitor.c @@ -2785,7 +2785,7 @@ static QDict *monitor_parse_arguments(Monitor *mon, break; } } - val =3D qemu_strtosz(p, &end); + val =3D qemu_strtosz_mebi(p, &end); if (val < 0) { monitor_printf(mon, "invalid size\n"); goto fail; diff --git a/tests/test-cutils.c b/tests/test-cutils.c index 383f812..86d36b7 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -1376,16 +1376,16 @@ static void test_qemu_strtosz_simple(void) int64_t res; =20 str =3D "0"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 1); =20 str =3D "12345M"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, 12345 * M_BYTE); g_assert(endptr =3D=3D str + 6); =20 - res =3D qemu_strtosz(str, NULL); + res =3D qemu_strtosz_mebi(str, NULL); g_assert_cmpint(res, =3D=3D, 12345 * M_BYTE); =20 /* Note: precision is 53 bits since we're parsing with strtod() */ @@ -1433,35 +1433,35 @@ static void test_qemu_strtosz_units(void) int64_t res; =20 /* default is M */ - res =3D qemu_strtosz(none, &endptr); + res =3D qemu_strtosz_mebi(none, &endptr); g_assert_cmpint(res, =3D=3D, M_BYTE); g_assert(endptr =3D=3D none + 1); =20 - res =3D qemu_strtosz(b, &endptr); + res =3D qemu_strtosz_mebi(b, &endptr); g_assert_cmpint(res, =3D=3D, 1); g_assert(endptr =3D=3D b + 2); =20 - res =3D qemu_strtosz(k, &endptr); + res =3D qemu_strtosz_mebi(k, &endptr); g_assert_cmpint(res, =3D=3D, K_BYTE); g_assert(endptr =3D=3D k + 2); =20 - res =3D qemu_strtosz(m, &endptr); + res =3D qemu_strtosz_mebi(m, &endptr); g_assert_cmpint(res, =3D=3D, M_BYTE); g_assert(endptr =3D=3D m + 2); =20 - res =3D qemu_strtosz(g, &endptr); + res =3D qemu_strtosz_mebi(g, &endptr); g_assert_cmpint(res, =3D=3D, G_BYTE); g_assert(endptr =3D=3D g + 2); =20 - res =3D qemu_strtosz(t, &endptr); + res =3D qemu_strtosz_mebi(t, &endptr); g_assert_cmpint(res, =3D=3D, T_BYTE); g_assert(endptr =3D=3D t + 2); =20 - res =3D qemu_strtosz(p, &endptr); + res =3D qemu_strtosz_mebi(p, &endptr); g_assert_cmpint(res, =3D=3D, P_BYTE); g_assert(endptr =3D=3D p + 2); =20 - res =3D qemu_strtosz(e, &endptr); + res =3D qemu_strtosz_mebi(e, &endptr); g_assert_cmpint(res, =3D=3D, E_BYTE); g_assert(endptr =3D=3D e + 2); } @@ -1472,7 +1472,7 @@ static void test_qemu_strtosz_float(void) char *endptr =3D NULL; int64_t res; =20 - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, 12.345 * M_BYTE); g_assert(endptr =3D=3D str + 7); } @@ -1484,17 +1484,17 @@ static void test_qemu_strtosz_invalid(void) int64_t res; =20 str =3D ""; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); =20 str =3D " \t "; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); =20 str =3D "crap"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); } @@ -1506,12 +1506,12 @@ static void test_qemu_strtosz_trailing(void) int64_t res; =20 str =3D "123xxx"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, 123 * M_BYTE); g_assert(endptr =3D=3D str + 3); =20 str =3D "1kiB"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, 1024); g_assert(endptr =3D=3D str + 2); } @@ -1523,7 +1523,7 @@ static void test_qemu_strtosz_erange(void) int64_t res; =20 str =3D "-1"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 2); =20 @@ -1543,7 +1543,7 @@ static void test_qemu_strtosz_erange(void) g_assert(endptr =3D=3D str + 19); =20 str =3D "10E"; - res =3D qemu_strtosz(str, &endptr); + res =3D qemu_strtosz_mebi(str, &endptr); g_assert_cmpint(res, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 3); } diff --git a/util/cutils.c b/util/cutils.c index 8a506e7..0315d5d 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -254,7 +254,7 @@ int64_t qemu_strtosz_suffix(const char *nptr, char **en= d, return do_strtosz(nptr, end, default_suffix, 1024); } =20 -int64_t qemu_strtosz(const char *nptr, char **end) +int64_t qemu_strtosz_mebi(const char *nptr, char **end) { return qemu_strtosz_suffix(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB); } --=20 2.7.4