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

Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/vrng-2.4' into staging 



Fire timer only when required.  Brings down wakeups by a big number.

# gpg: Signature made Fri Jul 17 14:41:40 2015 BST 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/vrng-2.4:
  virtio-rng: trigger timer only when guest requests for entropy

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5b5e8cdd 621a20e0

hw/virtio/virtio-rng.c

+8 −7
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ static void virtio_rng_process(VirtIORNG *vrng) 
        return;

    }



    if (vrng->activate_timer) {

        timer_mod(vrng->rate_limit_timer,

                  qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms);

        vrng->activate_timer = false;

    }



    if (vrng->quota_remaining < 0) {

        quota = 0;

    } else {
@@ -138,8 +144,7 @@ static void check_rate_limit(void *opaque) 


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

    virtio_rng_process(vrng);

    timer_mod(vrng->rate_limit_timer,

                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms);

    vrng->activate_timer = true;

}



static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
@@ -195,13 +200,9 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) 


    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,

                                               check_rate_limit, vrng);



    timer_mod(vrng->rate_limit_timer,

                   qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms);



    vrng->activate_timer = true;

    register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save,

                    virtio_rng_load, vrng);

}

include/hw/virtio/virtio-rng.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ typedef struct VirtIORNG { 
     */

    QEMUTimer *rate_limit_timer;

    int64_t quota_remaining;

    bool activate_timer;

} VirtIORNG;



#endif