Commit f1c5831c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Fixes an init-time check for parameter validity

# gpg: Signature made Mon 05 Jan 2015 08:34:05 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit-virtio-rng/tags/rng-for-2.3:
  virtio-rng: fix check for period_ms validity

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 11fe6808 a3a292c4

hw/virtio/virtio-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) 
    VirtIORNG *vrng = VIRTIO_RNG(dev);

    Error *local_err = NULL;



    if (!vrng->conf.period_ms > 0) {

    if (vrng->conf.period_ms <= 0) {

        error_setg(errp, "'period' parameter expects a positive integer");

        return;

    }