mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1366790881-3026-2-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-04-24 10:07:54 +02:00 committed by Anthony Liguori
parent 5a37532d08
commit af1a8ad646
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/virtio/virtio-rng.c
View File

@ -124,10 +124,10 @@ static void check_rate_limit(void *opaque)
{ {
VirtIORNG *s = opaque; VirtIORNG *s = opaque;
s->quota_remaining = s->conf->max_bytes; s->quota_remaining = s->conf.max_bytes;
virtio_rng_process(s); virtio_rng_process(s);
qemu_mod_timer(s->rate_limit_timer, 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->vdev.get_features = get_features;
vrng->qdev = dev; vrng->qdev = dev;
vrng->conf = conf; memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf));
assert(vrng->conf->max_bytes <= INT64_MAX); assert(vrng->conf.max_bytes <= INT64_MAX);
vrng->quota_remaining = vrng->conf->max_bytes; vrng->quota_remaining = vrng->conf.max_bytes;
vrng->rate_limit_timer = qemu_new_timer_ms(vm_clock, vrng->rate_limit_timer = qemu_new_timer_ms(vm_clock,
check_rate_limit, vrng); check_rate_limit, vrng);
qemu_mod_timer(vrng->rate_limit_timer, 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, register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save,
virtio_rng_load, vrng); virtio_rng_load, vrng);

2
include/hw/virtio/virtio-rng.h
View File

@ -33,7 +33,7 @@ typedef struct VirtIORNG {
/* Only one vq - guest puts buffer(s) on it when it needs entropy */ /* Only one vq - guest puts buffer(s) on it when it needs entropy */
VirtQueue *vq; VirtQueue *vq;
VirtIORNGConf *conf; VirtIORNGConf conf;
RngBackend *rng; RngBackend *rng;