diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-04-23 11:08:43 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-23 10:37:49 -0500 |
| commit | 13daf6cad05a65970381cd8b876426d55133aadf (patch) | |
| tree | 4ba75a8b4f2f3ca8393565c262de96d759fc94f4 /hw | |
| parent | e8111e50557761b0d86cd5c90fe7a272aeddd7a3 (diff) | |
virtio-9p: cleanup: QOM casts.
As the virtio-9p-pci is switched to the new API, we can use QOM casts.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Message-id: 1366708123-19626-5-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/virtio-9p-device.c | 11 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p.c | 2 | ||||
| -rw-r--r-- | 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 29a639e842..62a291bbce 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 db2ae32fe8..296f66f293 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 e1fa5065a3..1d6eedb7d8 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -205,7 +205,7 @@ struct V9fsFidState typedef struct V9fsState { - VirtIODevice vdev; + VirtIODevice parent_obj; VirtQueue *vq; V9fsPDU pdus[MAX_REQ]; QLIST_HEAD(, V9fsPDU) free_list; |