[PULL,12/23] virtio: add AioContext-specific function for host notifiers

Commit Message

Michael S. Tsirkin Feb. 24, 2016, 8:35 p.m. UTC

From: Paolo Bonzini <[e-mail]>

This is used to register ioeventfd with a dataplane thread.

Signed-off-by: Paolo Bonzini <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Signed-off-by: Michael S. Tsirkin <[e-mail]>
Reviewed-by: Fam Zheng <[e-mail]>
Acked-by: Stefan Hajnoczi <[e-mail]>
---
 include/hw/virtio/virtio.h |  2 ++
 hw/virtio/virtio.c         | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

Patch

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index c38a2fe..3ecdb20 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -249,6 +249,8 @@  void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
 EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
 void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,
                                                bool set_handler);
+void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,
+                                                bool assign, bool set_handler);
 void virtio_queue_notify_vq(VirtQueue *vq);
 void virtio_irq(VirtQueue *vq);
 VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index e365960..f419e7c 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1786,6 +1786,22 @@  static void virtio_queue_host_notifier_read(EventNotifier *n)
     }
 }
 
+void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,
+                                                bool assign, bool set_handler)
+{
+    if (assign && set_handler) {
+        aio_set_event_notifier(ctx, &vq->host_notifier, true,
+                               virtio_queue_host_notifier_read);
+    } else {
+        aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL);
+    }
+    if (!assign) {
+        /* Test and clear notifier before after disabling event,
+         * in case poll callback didn't have time to run. */
+        virtio_queue_host_notifier_read(&vq->host_notifier);
+    }
+}
+
 void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign,
                                                bool set_handler)
 {