[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 3/7] virtio: Introduce virtio_add_queue_aio
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v2 3/7] virtio: Introduce virtio_add_queue_aio |
Date: |
Fri, 24 Jun 2016 20:39:30 +0800 |
Using this function instead of virtio_add_queue marks the vq as aio
based. This differentiation will be useful in later patches.
Signed-off-by: Fam Zheng <address@hidden>
---
hw/virtio/virtio.c | 19 +++++++++++++++++--
include/hw/virtio/virtio.h | 3 +++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index bba73bb..1ea6f66 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -97,6 +97,7 @@ struct VirtQueue
uint16_t vector;
VirtIOHandleOutput handle_output;
VirtIOHandleOutput handle_aio_output;
+ bool use_aio;
VirtIODevice *vdev;
EventNotifier guest_notifier;
EventNotifier host_notifier;
@@ -1130,8 +1131,9 @@ void virtio_queue_set_vector(VirtIODevice *vdev, int n,
uint16_t vector)
}
}
-VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
- VirtIOHandleOutput handle_output)
+static VirtQueue *virtio_add_queue_internal(VirtIODevice *vdev, int queue_size,
+ VirtIOHandleOutput handle_output,
+ bool use_aio)
{
int i;
@@ -1148,10 +1150,23 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int
queue_size,
vdev->vq[i].vring.align = VIRTIO_PCI_VRING_ALIGN;
vdev->vq[i].handle_output = handle_output;
vdev->vq[i].handle_aio_output = NULL;
+ vdev->vq[i].use_aio = use_aio;
return &vdev->vq[i];
}
+VirtQueue *virtio_add_queue_aio(VirtIODevice *vdev, int queue_size,
+ VirtIOHandleOutput handle_output)
+{
+ return virtio_add_queue_internal(vdev, queue_size, handle_output, true);
+}
+
+VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
+ VirtIOHandleOutput handle_output)
+{
+ return virtio_add_queue_internal(vdev, queue_size, handle_output, false);
+}
+
void virtio_del_queue(VirtIODevice *vdev, int n)
{
if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index b104104..1e8cae5 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -143,6 +143,9 @@ typedef void (*VirtIOHandleOutput)(VirtIODevice *,
VirtQueue *);
VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
VirtIOHandleOutput handle_output);
+VirtQueue *virtio_add_queue_aio(VirtIODevice *vdev, int queue_size,
+ VirtIOHandleOutput handle_output);
+
void virtio_del_queue(VirtIODevice *vdev, int n);
void *virtqueue_alloc_element(size_t sz, unsigned out_num, unsigned in_num);
--
2.8.3
- [Qemu-block] [PATCH v2 0/7] virtio: Merge virtio-{blk, scsi} host notifier handling paths, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 1/7] virtio-bus: Drop "set_handler" parameter, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 2/7] virtio: Add typedef for handle_output, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 4/7] virtio: Use aio_set_event_notifier for aio vq, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 3/7] virtio: Introduce virtio_add_queue_aio,
Fam Zheng <=
- [Qemu-block] [PATCH v2 6/7] virtio-scsi: Call virtio_add_queue_aio, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 5/7] virtio-blk: Call virtio_add_queue_aio, Fam Zheng, 2016/06/24
- [Qemu-block] [PATCH v2 7/7] Revert "mirror: Workaround for unexpected iohandler events during completion", Fam Zheng, 2016/06/24
- Re: [Qemu-block] [PATCH v2 0/7] virtio: Merge virtio-{blk, scsi} host notifier handling paths, Stefan Hajnoczi, 2016/06/28