diff options
author | John Snow | 2014-07-30 01:28:58 +0200 |
---|---|---|
committer | Amit Shah | 2014-08-04 11:20:11 +0200 |
commit | c617dd3b7e8e82511060b8f7a9c51e46c5c1e87a (patch) | |
tree | a3f91a2fbd9d74ad2be2d6effed10234c515f172 /hw/virtio | |
parent | virtio-rng: Move error-checking forward to prevent memory leak (diff) | |
download | qemu-c617dd3b7e8e82511060b8f7a9c51e46c5c1e87a.tar.gz qemu-c617dd3b7e8e82511060b8f7a9c51e46c5c1e87a.tar.xz qemu-c617dd3b7e8e82511060b8f7a9c51e46c5c1e87a.zip |
virtio-rng: replace error_set calls with error_setg
Under recommendation from Luiz Capitulino, we are changing
the error_set calls to error_setg while we are fixing up
the error handling pathways of virtio-rng.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'hw/virtio')
-rw-r--r-- | hw/virtio/virtio-rng.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index ff589172bd..03fd04a1e5 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -142,16 +142,15 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) Error *local_err = NULL; if (!vrng->conf.period_ms > 0) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "period", - "a positive number"); + error_setg(errp, "'period' parameter expects a positive integer"); return; } /* Workaround: Property parsing does not enforce unsigned integers, * So this is a hack to reject such numbers. */ if (vrng->conf.max_bytes > INT64_MAX) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "max-bytes", - "a non-negative integer below 2^63"); + error_setg(errp, "'max-bytes' parameter must be non-negative, " + "and less than 2^63"); return; } @@ -181,7 +180,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) vrng->rng = vrng->conf.rng; if (vrng->rng == NULL) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "rng", "a valid object"); + error_setg(errp, "'rng' parameter expects a valid object"); return; } |