Commit 924c09db authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.2' into staging 



* remotes/amit-virtio-rng/for-2.2:
  virtio-rng: replace error_set calls with error_setg
  virtio-rng: Move error-checking forward to prevent memory leak

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7b13ff3f c617dd3b

hw/virtio/virtio-rng.c

+12 −13
Original line number Diff line number Diff line
@@ -142,8 +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_setg(errp, "'max-bytes' parameter must be non-negative, "

                   "and less than 2^63");

        return;

    }
@@ -171,23 +178,15 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) 
                                 "rng", NULL);

    }



    virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0);



    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;

    }



    vrng->vq = virtio_add_queue(vdev, 8, handle_input);

    virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0);



    /* 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");

        return;

    }

    vrng->vq = virtio_add_queue(vdev, 8, handle_input);

    vrng->quota_remaining = vrng->conf.max_bytes;



    vrng->rate_limit_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,