From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUukr-0002Wl-Ot for qemu-devel@nongnu.org; Wed, 24 Apr 2013 04:08:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUukq-0006C6-DP for qemu-devel@nongnu.org; Wed, 24 Apr 2013 04:08:41 -0400 Received: from greensocs.com ([87.106.252.221]:42208 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUukq-0006Bn-2Z for qemu-devel@nongnu.org; Wed, 24 Apr 2013 04:08:40 -0400 From: fred.konrad@greensocs.com Date: Wed, 24 Apr 2013 10:08:01 +0200 Message-Id: <1366790881-3026-9-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1366790881-3026-1-git-send-email-fred.konrad@greensocs.com> References: <1366790881-3026-1-git-send-email-fred.konrad@greensocs.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RESEND v4 8/8] virtio-rng: cleanup: use QOM casts. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, fred.konrad@greensocs.com From: KONRAD Frederic As the virtio-rng-pci, virtio-rng-s390 and virtio-rng-ccw are switched to the new API, we can use QOM casts. Signed-off-by: KONRAD Frederic Reviewed-by: Andreas F=C3=A4rber --- hw/virtio/virtio-rng.c | 27 +++++++++++++++------------ 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 a1dbd1e..96e8075 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -18,8 +18,9 @@ =20 static bool is_guest_ready(VirtIORNG *vrng) { + VirtIODevice *vdev =3D 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 =3D opaque; + VirtIODevice *vdev =3D VIRTIO_DEVICE(vrng); VirtQueueElement elem; size_t len; int offset; @@ -60,7 +62,7 @@ static void chr_read(void *opaque, const void *buf, siz= e_t size) =20 virtqueue_push(vrng->vq, &elem, len); } - virtio_notify(&vrng->vdev, vrng->vq); + virtio_notify(vdev, vrng->vq); } =20 static void virtio_rng_process(VirtIORNG *vrng) @@ -86,7 +88,7 @@ static void virtio_rng_process(VirtIORNG *vrng) =20 static void handle_input(VirtIODevice *vdev, VirtQueue *vq) { - VirtIORNG *vrng =3D DO_UPCAST(VirtIORNG, vdev, vdev); + VirtIORNG *vrng =3D VIRTIO_RNG(vdev); virtio_rng_process(vrng); } =20 @@ -97,19 +99,20 @@ static uint32_t get_features(VirtIODevice *vdev, uint= 32_t f) =20 static void virtio_rng_save(QEMUFile *f, void *opaque) { - VirtIORNG *vrng =3D opaque; + VirtIODevice *vdev =3D opaque; =20 - virtio_save(&vrng->vdev, f); + virtio_save(vdev, f); } =20 static int virtio_rng_load(QEMUFile *f, void *opaque, int version_id) { VirtIORNG *vrng =3D opaque; + VirtIODevice *vdev =3D VIRTIO_DEVICE(vrng); =20 if (version_id !=3D 1) { return -EINVAL; } - virtio_load(&vrng->vdev, f); + virtio_load(vdev, f); =20 /* We may have an element ready but couldn't process it due to a quo= ta * limit. Make sure to try again after live migration when the quot= a may @@ -122,12 +125,12 @@ static int virtio_rng_load(QEMUFile *f, void *opaqu= e, int version_id) =20 static void check_rate_limit(void *opaque) { - VirtIORNG *s =3D opaque; + VirtIORNG *vrng =3D opaque; =20 - s->quota_remaining =3D 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 =3D 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); } =20 static int virtio_rng_device_init(VirtIODevice *vdev) @@ -166,7 +169,7 @@ static int virtio_rng_device_init(VirtIODevice *vdev) =20 vrng->vq =3D virtio_add_queue(vdev, 8, handle_input); =20 - vrng->vdev.get_features =3D get_features; + vdev->get_features =3D get_features; =20 assert(vrng->conf.max_bytes <=3D INT64_MAX); vrng->quota_remaining =3D vrng->conf.max_bytes; diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rn= g.h index 4347818..debaa15 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -30,7 +30,7 @@ struct VirtIORNGConf { }; =20 typedef struct VirtIORNG { - VirtIODevice vdev; + VirtIODevice parent_obj; =20 /* Only one vq - guest puts buffer(s) on it when it needs entropy */ VirtQueue *vq; --=20 1.7.11.7