diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-02-21 21:14:06 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-02-23 20:35:36 +0100 |
| commit | f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7 (patch) | |
| tree | 65d92c1363f1c071214779eee670185ff31094e7 /hw | |
| parent | 4fcdf65ae2c00ae69f7625f26ed41f37d77b403c (diff) | |
| download | qemu-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 'hw')
| -rw-r--r-- | hw/misc/ivshmem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 848bebc..80856fd 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -1267,8 +1267,11 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp) if (s->sizearg == NULL) { s->legacy_size = 4 << 20; /* 4 MB default */ } else { - int64_t size = qemu_strtosz_MiB(s->sizearg, NULL); - if (size < 0 || (size_t)size != size || !is_power_of_2(size)) { + int ret; + int64_t size; + + ret = qemu_strtosz_MiB(s->sizearg, NULL, &size); + if (ret < 0 || (size_t)size != size || !is_power_of_2(size)) { error_setg(errp, "Invalid size %s", s->sizearg); return; } |