OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/cutils: New qemu_strtosz_metric() 

To parse numbers with metric suffixes, we use

    qemu_strtosz_suffix_unit(nptr, &eptr, QEMU_STRTOSZ_DEFSUFFIX_B, 1000)

Capture this in a new function for legibility:

    qemu_strtosz_metric(nptr, &eptr)

Replace test_qemu_strtosz_suffix_unit() by test_qemu_strtosz_metric().

Rename qemu_strtosz_suffix_unit() to do_strtosz() and give it internal
linkage.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487708048-2131-15-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-21 21:13:58 +01:00
parent 0b742797aa
commit d2734d2629
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qemu/cutils.h
View File

@ -156,8 +156,8 @@ int parse_uint_full(const char *s, unsigned long long *value, int base);
int64_t qemu_strtosz(const char *nptr, char **end); int64_t qemu_strtosz(const char *nptr, char **end);
int64_t qemu_strtosz_suffix(const char *nptr, char **end, int64_t qemu_strtosz_suffix(const char *nptr, char **end,
const char default_suffix); const char default_suffix);
int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, int64_t qemu_strtosz_metric(const char *nptr, char **end);
const char default_suffix, int64_t unit);
#define K_BYTE (1ULL << 10) #define K_BYTE (1ULL << 10)
#define M_BYTE (1ULL << 20) #define M_BYTE (1ULL << 20)
#define G_BYTE (1ULL << 30) #define G_BYTE (1ULL << 30)

3
target/i386/cpu.c
View File

@ -2036,8 +2036,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
int64_t tsc_freq; int64_t tsc_freq;
char *err; char *err;
tsc_freq = qemu_strtosz_suffix_unit(val, &err, tsc_freq = qemu_strtosz_metric(val, &err);
QEMU_STRTOSZ_DEFSUFFIX_B, 1000);
if (tsc_freq < 0 || *err) { if (tsc_freq < 0 || *err) {
error_setg(errp, "bad numerical value %s", val); error_setg(errp, "bad numerical value %s", val);
return; return;

13
tests/test-cutils.c
View File

@ -1548,16 +1548,15 @@ static void test_qemu_strtosz_erange(void)
g_assert(endptr == str + 3); g_assert(endptr == str + 3);
} }
static void test_qemu_strtosz_suffix_unit(void) static void test_qemu_strtosz_metric(void)
{ {
const char *str = "12345"; const char *str = "12345k";
char *endptr = NULL; char *endptr = NULL;
int64_t res; int64_t res;
res = qemu_strtosz_suffix_unit(str, &endptr, res = qemu_strtosz_metric(str, &endptr);
QEMU_STRTOSZ_DEFSUFFIX_KB, 1000);
g_assert_cmpint(res, ==, 12345000); g_assert_cmpint(res, ==, 12345000);
g_assert(endptr == str + 5); g_assert(endptr == str + 6);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -1754,8 +1753,8 @@ int main(int argc, char **argv)
test_qemu_strtosz_trailing); test_qemu_strtosz_trailing);
g_test_add_func("/cutils/strtosz/erange", g_test_add_func("/cutils/strtosz/erange",
test_qemu_strtosz_erange); test_qemu_strtosz_erange);
g_test_add_func("/cutils/strtosz/suffix-unit", g_test_add_func("/cutils/strtosz/metric",
test_qemu_strtosz_suffix_unit); test_qemu_strtosz_metric);
return g_test_run(); return g_test_run();
} }

9
util/cutils.c
View File

@ -205,7 +205,7 @@ static int64_t suffix_mul(char suffix, int64_t unit)
* in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on * in *end, if not NULL. Return -ERANGE on overflow, Return -EINVAL on
* other error. * other error.
*/ */
int64_t qemu_strtosz_suffix_unit(const char *nptr, char **end, static int64_t do_strtosz(const char *nptr, char **end,
const char default_suffix, int64_t unit) const char default_suffix, int64_t unit)
{ {
int64_t retval = -EINVAL; int64_t retval = -EINVAL;
@ -251,7 +251,7 @@ fail:
int64_t qemu_strtosz_suffix(const char *nptr, char **end, int64_t qemu_strtosz_suffix(const char *nptr, char **end,
const char default_suffix) const char default_suffix)
{ {
return qemu_strtosz_suffix_unit(nptr, end, default_suffix, 1024); return do_strtosz(nptr, end, default_suffix, 1024);
} }
int64_t qemu_strtosz(const char *nptr, char **end) int64_t qemu_strtosz(const char *nptr, char **end)
@ -259,6 +259,11 @@ int64_t qemu_strtosz(const char *nptr, char **end)
return qemu_strtosz_suffix(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB); return qemu_strtosz_suffix(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_MB);
} }
int64_t qemu_strtosz_metric(const char *nptr, char **end)
{
return do_strtosz(nptr, end, QEMU_STRTOSZ_DEFSUFFIX_B, 1000);
}
/** /**
* Helper function for error checking after strtol() and the like * Helper function for error checking after strtol() and the like
*/ */