commit f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7
author Markus Armbruster <armbru@redhat.com> Tue Feb 21 21:14:06 2017 +0100
committer Markus Armbruster <armbru@redhat.com> Thu Feb 23 20:35:36 2017 +0100
tree 65d92c1363f1c071214779eee670185ff31094e7
parent 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c

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>

qapi/opts-visitor.c

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 911a0ee..aac2e09 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -482,14 +482,15 @@
     OptsVisitor *ov = to_ov(v);
     const QemuOpt *opt;
     int64_t val;
+    int err;
 
     opt = lookup_scalar(ov, name, errp);
     if (!opt) {
         return;
     }
 
-    val = qemu_strtosz(opt->str ? opt->str : "", NULL);
-    if (val < 0) {
+    err = qemu_strtosz(opt->str ? opt->str : "", NULL, &val);
+    if (err < 0) {
         error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
                    "a size value representible as a non-negative int64");
         return;