aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-21 21:14:06 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-02-23 20:35:36 +0100
commitf17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7 (patch)
tree65d92c1363f1c071214779eee670185ff31094e7 /target
parent4fcdf65ae2c00ae69f7625f26ed41f37d77b403c (diff)
downloadqemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.zip
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.gz
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.bz2
util/cutils: Return qemu_strtosz*() error and value separately
This makes qemu_strtosz(), qemu_strtosz_mebi() and qemu_strtosz_metric() similar to qemu_strtoi64(), except negative values are rejected. Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> (maintainer:X86) Cc: Kevin Wolf <kwolf@redhat.com> (supporter:Block layer core) Cc: Max Reitz <mreitz@redhat.com> (supporter:Block layer core) Cc: qemu-block@nongnu.org (open list:Block layer core) Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <1487708048-2131-23-git-send-email-armbru@redhat.com>
Diffstat (limited to 'target')
-rw-r--r--target/i386/cpu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 58a05ec..d32af97 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2033,10 +2033,11 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
/* Special case: */
if (!strcmp(name, "tsc-freq")) {
+ int ret;
int64_t tsc_freq;
- tsc_freq = qemu_strtosz_metric(val, NULL);
- if (tsc_freq < 0) {
+ ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
+ if (ret < 0) {
error_setg(errp, "bad numerical value %s", val);
return;
}