[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] Revert "virtio: Introduce virtio_add_queue_ai
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/12] Revert "virtio: Introduce virtio_add_queue_aio" |
Date: |
Wed, 21 Sep 2016 15:18:54 +0200 |
This reverts commit 872dd82c83745a603d2e07a03d34313eb6467ae4.
virtio_add_queue_aio is unused.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio.c | 38 ++++----------------------------------
include/hw/virtio/virtio.h | 3 ---
2 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 84abd08..d1cc2f5 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -97,7 +97,6 @@ struct VirtQueue
uint16_t vector;
VirtIOHandleOutput handle_output;
VirtIOHandleOutput handle_aio_output;
- bool use_aio;
VirtIODevice *vdev;
EventNotifier guest_notifier;
EventNotifier host_notifier;
@@ -1141,9 +1140,8 @@ void virtio_queue_set_vector(VirtIODevice *vdev, int n,
uint16_t vector)
}
}
-static VirtQueue *virtio_add_queue_internal(VirtIODevice *vdev, int queue_size,
- VirtIOHandleOutput handle_output,
- bool use_aio)
+VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
+ VirtIOHandleOutput handle_output)
{
int i;
@@ -1160,28 +1158,10 @@ static VirtQueue
*virtio_add_queue_internal(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];
}
-/* Add a virt queue and mark AIO.
- * An AIO queue will use the AioContext based event interface instead of the
- * default IOHandler and EventNotifier interface.
- */
-VirtQueue *virtio_add_queue_aio(VirtIODevice *vdev, int queue_size,
- VirtIOHandleOutput handle_output)
-{
- return virtio_add_queue_internal(vdev, queue_size, handle_output, true);
-}
-
-/* Add a normal virt queue (on the contrary to the AIO version above. */
-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) {
@@ -1866,21 +1846,11 @@ static void
virtio_queue_host_notifier_read(EventNotifier *n)
void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,
bool set_handler)
{
- AioContext *ctx = qemu_get_aio_context();
if (assign && set_handler) {
- if (vq->use_aio) {
- aio_set_event_notifier(ctx, &vq->host_notifier, true,
+ event_notifier_set_handler(&vq->host_notifier, true,
virtio_queue_host_notifier_read);
- } else {
- event_notifier_set_handler(&vq->host_notifier, true,
- virtio_queue_host_notifier_read);
- }
} else {
- if (vq->use_aio) {
- aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL);
- } else {
- event_notifier_set_handler(&vq->host_notifier, true, NULL);
- }
+ event_notifier_set_handler(&vq->host_notifier, true, NULL);
}
if (!assign) {
/* Test and clear notifier before after disabling event,
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index ec50f7a..1db4fbf 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -145,9 +145,6 @@ 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.7.4
- [Qemu-devel] [PATCH 00/12] virtio: cleanup ioeventfd start/stop, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 01/12] virtio: move ioeventfd_disabled flag to VirtioBusState, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 04/12] virtio: introduce virtio_device_ioeventfd_enabled, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 02/12] virtio: move ioeventfd_started flag to VirtioBusState, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 05/12] virtio-blk: always use dataplane path if ioeventfd is active, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 03/12] virtio: add start_ioeventfd and stop_ioeventfd to VirtioDeviceClass, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 07/12] Revert "virtio: Introduce virtio_add_queue_aio",
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/12] virtio-scsi: always use dataplane path if ioeventfd is active, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 11/12] virtio: inline virtio_queue_set_host_notifier_fd_handler, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 10/12] virtio: do not export set_host_notifier_internal, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 09/12] virtio: remove ioeventfd_disabled altogether, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 08/12] virtio: remove set_handler argument from set_host_notifier_internal, Paolo Bonzini, 2016/09/21
- [Qemu-devel] [PATCH 12/12] virtio: inline set_host_notifier_internal, Paolo Bonzini, 2016/09/21