diff options
| -rw-r--r-- | hw/virtio/virtio-rng.c | 27 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-rng.h | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index a1dbd1e52f..96e807539b 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -18,8 +18,9 @@ static bool is_guest_ready(VirtIORNG *vrng) { + VirtIODevice *vdev = VIRTIO_DEVICE(vrng); if (virtio_queue_ready(vrng->vq) - && (vrng->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { + && (vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) { return true; } return false; @@ -39,6 +40,7 @@ static void virtio_rng_process(VirtIORNG *vrng); static void chr_read(void *opaque, const void *buf, size_t size) { VirtIORNG *vrng = opaque; + VirtIODevice *vdev = VIRTIO_DEVICE(vrng); VirtQueueElement elem; size_t len; int offset; @@ -60,7 +62,7 @@ static void chr_read(void *opaque, const void *buf, size_t size) virtqueue_push(vrng->vq, &elem, len); } - virtio_notify(&vrng->vdev, vrng->vq); + virtio_notify(vdev, vrng->vq); } static void virtio_rng_process(VirtIORNG *vrng) @@ -86,7 +88,7 @@ static void virtio_rng_process(VirtIORNG *vrng) static void handle_input(VirtIODevice *vdev, VirtQueue *vq) { - VirtIORNG *vrng = DO_UPCAST(VirtIORNG, vdev, vdev); + VirtIORNG *vrng = VIRTIO_RNG(vdev); virtio_rng_process(vrng); } @@ -97,19 +99,20 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t f) static void virtio_rng_save(QEMUFile *f, void *opaque) { - VirtIORNG *vrng = opaque; + VirtIODevice *vdev = opaque; - virtio_save(&vrng->vdev, f); + virtio_save(vdev, f); } static int virtio_rng_load(QEMUFile *f, void *opaque, int version_id) { VirtIORNG *vrng = opaque; + VirtIODevice *vdev = VIRTIO_DEVICE(vrng); if (version_id != 1) { return -EINVAL; } - virtio_load(&vrng->vdev, f); + virtio_load(vdev, f); /* We may have an element ready but couldn't process it due to a quota * limit. Make sure to try again after live migration when the quota may @@ -122,12 +125,12 @@ static int virtio_rng_load(QEMUFile *f, void *opaque, int version_id) static void check_rate_limit(void *opaque) { - VirtIORNG *s = opaque; + VirtIORNG *vrng = opaque; - 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); + vrng->quota_remaining = vrng->conf.max_bytes; + virtio_rng_process(vrng); + qemu_mod_timer(vrng->rate_limit_timer, + qemu_get_clock_ms(vm_clock) + vrng->conf.period_ms); } static int virtio_rng_device_init(VirtIODevice *vdev) @@ -166,7 +169,7 @@ static int virtio_rng_device_init(VirtIODevice *vdev) vrng->vq = virtio_add_queue(vdev, 8, handle_input); - vrng->vdev.get_features = get_features; + vdev->get_features = get_features; assert(vrng->conf.max_bytes <= INT64_MAX); vrng->quota_remaining = vrng->conf.max_bytes; diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 4347818b51..debaa15d5a 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -30,7 +30,7 @@ struct VirtIORNGConf { }; typedef struct VirtIORNG { - VirtIODevice vdev; + VirtIODevice parent_obj; /* Only one vq - guest puts buffer(s) on it when it needs entropy */ VirtQueue *vq; |