Commit af1a8ad6 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-rng: don't use pointer for configuration. 



The configuration field must not be a pointer as it will be used for
virtio-rng properties. So *conf is replaced by conf.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Message-id: 1366790881-3026-2-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 5a37532d

hw/virtio/virtio-rng.c

+6 −6
Original line number Diff line number Diff line
@@ -124,10 +124,10 @@ static void check_rate_limit(void *opaque) 
{

    VirtIORNG *s = opaque;



    s->quota_remaining = s->conf->max_bytes;

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

    virtio_rng_process(s);

    qemu_mod_timer(s->rate_limit_timer,

                   qemu_get_clock_ms(vm_clock) + s->conf->period_ms);

                   qemu_get_clock_ms(vm_clock) + s->conf.period_ms);

}
@@ -159,16 +159,16 @@ VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) 
    vrng->vdev.get_features = get_features;



    vrng->qdev = dev;

    vrng->conf = conf;

    memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf));



    assert(vrng->conf->max_bytes <= INT64_MAX);

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

    assert(vrng->conf.max_bytes <= INT64_MAX);

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



    vrng->rate_limit_timer = qemu_new_timer_ms(vm_clock,

                                               check_rate_limit, vrng);



    qemu_mod_timer(vrng->rate_limit_timer,

                   qemu_get_clock_ms(vm_clock) + vrng->conf->period_ms);

                   qemu_get_clock_ms(vm_clock) + vrng->conf.period_ms);



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

                    virtio_rng_load, vrng);

include/hw/virtio/virtio-rng.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ typedef struct VirtIORNG { 
    /* Only one vq - guest puts buffer(s) on it when it needs entropy */

    VirtQueue *vq;



    VirtIORNGConf *conf;

    VirtIORNGConf conf;



    RngBackend *rng;