From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPZKw-00008S-Bk for qemu-devel@nongnu.org; Tue, 09 Apr 2013 10:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPZKr-0002SG-HM for qemu-devel@nongnu.org; Tue, 09 Apr 2013 10:15:50 -0400 Received: from greensocs.com ([87.106.252.221]:40982 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPZKq-0002Rt-9i for qemu-devel@nongnu.org; Tue, 09 Apr 2013 10:15:44 -0400 From: fred.konrad@greensocs.com Date: Tue, 9 Apr 2013 16:14:34 +0200 Message-Id: <1365516874-31399-5-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1365516874-31399-1-git-send-email-fred.konrad@greensocs.com> References: <1365516874-31399-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH v3 4/4] virtio-9p: cleanup: QOM casts. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, qemu-devel@nongnu.org, aneesh.kumar@linux.vnet.ibm.com Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, 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 --- 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 29a639e..62a291b 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); @@ -97,9 +92,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 db2ae32..296f66f 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 767f7e6..e42c8f8 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -206,7 +206,7 @@ struct V9fsFidState typedef struct V9fsState { - VirtIODevice vdev; + VirtIODevice parent_obj; VirtQueue *vq; V9fsPDU pdus[MAX_REQ]; QLIST_HEAD(, V9fsPDU) free_list; -- 1.8.1.4