From patchwork Tue Jan 15 14:09:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V3,44/44] virtio-9p: cleanup: QOM casts. Date: Tue, 15 Jan 2013 04:09:58 -0000 From: fred.konrad@greensocs.com X-Patchwork-Id: 212162 Message-Id: <1358258998-6504-45-git-send-email-fred.konrad@greensocs.com> To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, deepakcs@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic As the virtio-9p-pci is switched to the new API, we can use QOM casts. Signed-off-by: KONRAD Frederic Tested-by: Deepak C Shetty --- hw/9pfs/virtio-9p-device.c | 11 +++-------- hw/9pfs/virtio-9p.c | 2 +- hw/9pfs/virtio-9p.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 6a129d0..64768ce 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -26,16 +26,11 @@ static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features) return features; } -static V9fsState *to_virtio_9p(VirtIODevice *vdev) -{ - return (V9fsState *)vdev; -} - static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) { int len; struct virtio_9p_config *cfg; - V9fsState *s = to_virtio_9p(vdev); + V9fsState *s = VIRTIO_9P(vdev); len = strlen(s->tag); cfg = g_malloc0(sizeof(struct virtio_9p_config) + len); @@ -107,9 +102,9 @@ static int virtio_9p_device_init(VirtIODevice *vdev) s->ctx.uid = -1; s->ops = fse->ops; - s->vdev.get_features = virtio_9p_get_features; + vdev->get_features = virtio_9p_get_features; s->config_size = sizeof(struct virtio_9p_config) + len; - s->vdev.get_config = virtio_9p_get_config; + vdev->get_config = virtio_9p_get_config; s->fid_list = NULL; qemu_co_rwlock_init(&s->rename_lock); diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 0aaf0d2..aedea0c 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -631,7 +631,7 @@ static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len) virtqueue_push(s->vq, &pdu->elem, len); /* FIXME: we should batch these completions */ - virtio_notify(&s->vdev, s->vq); + virtio_notify(VIRTIO_DEVICE(s), s->vq); /* Now wakeup anybody waiting in flush for this request */ qemu_co_queue_next(&pdu->complete); diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index e88e038..33e63c2 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -207,7 +207,7 @@ struct V9fsFidState typedef struct V9fsState { - VirtIODevice vdev; + VirtIODevice parent_obj; VirtQueue *vq; V9fsPDU pdus[MAX_REQ]; QLIST_HEAD(, V9fsPDU) free_list;