Support host/guest notifiers in virtio-pci.

The last one only with kvm, that's okay

because vhost relies on kvm anyway.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

---

 hw/virtio-pci.c |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++

 1 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c

index 05898c8..c454093 100644

--- a/hw/virtio-pci.c

+++ b/hw/virtio-pci.c

@@ -23,6 +23,7 @@

 #include "msix.h"

 #include "net.h"

 #include "loader.h"

+#include "kvm.h"

 /* from Linux's linux/virtio_pci.h */

@@ -394,6 +395,65 @@ static unsigned virtio_pci_get_features(void *opaque)

     return proxy->host_features;

 }

+static void virtio_pci_guest_notifier_read(void *opaque)

+{

+    VirtQueue *vq = opaque;

+    EventNotifier *n = virtio_queue_guest_notifier(vq);

+    if (event_notifier_test_and_clear(n)) {

+        virtio_irq(vq);

+    }

+}

+

+static int virtio_pci_guest_notifier(void *opaque, int n, bool assign)

+{

+    VirtIOPCIProxy *proxy = opaque;

+    VirtQueue *vq = virtio_queue(proxy->vdev, n);

+    EventNotifier *notifier = virtio_queue_guest_notifier(vq);

+

+    if (assign) {

+        int r = event_notifier_init(notifier, 0);

+	if (r < 0)

+		return r;

+        qemu_set_fd_handler(event_notifier_get_fd(notifier),

+                            virtio_pci_guest_notifier_read, NULL, vq);

+    } else {

+        qemu_set_fd_handler(event_notifier_get_fd(notifier),

+                            NULL, NULL, vq);

+        event_notifier_cleanup(notifier);

+    }

+

+    return 0;

+}

+

+static int virtio_pci_host_notifier(void *opaque, int n, bool assign)

+{

+    VirtIOPCIProxy *proxy = opaque;

+    VirtQueue *vq = virtio_queue(proxy->vdev, n);

+    EventNotifier *notifier = virtio_queue_host_notifier(vq);

+    int r;

+    if (assign) {

+	r = event_notifier_init(notifier, 1);

+	if (r < 0) {

+		return r;

+        }

+        r = kvm_set_ioeventfd(proxy->addr + VIRTIO_PCI_QUEUE_NOTIFY,

+                              n, event_notifier_get_fd(notifier),

+                              assign);

+        if (r < 0) {

+            event_notifier_cleanup(notifier);

+        }

+    } else {

+        r = kvm_set_ioeventfd(proxy->addr + VIRTIO_PCI_QUEUE_NOTIFY,

+                              n, event_notifier_get_fd(notifier),

+                              assign);

+	if (r < 0) {

+		return r;

+        }

+        event_notifier_cleanup(notifier);

+    }

+    return r;

+}

+

 static const VirtIOBindings virtio_pci_bindings = {

     .notify = virtio_pci_notify,

     .save_config = virtio_pci_save_config,

@@ -401,6 +461,8 @@ static const VirtIOBindings virtio_pci_bindings = {

     .save_queue = virtio_pci_save_queue,

     .load_queue = virtio_pci_load_queue,

     .get_features = virtio_pci_get_features,

+    .host_notifier = virtio_pci_host_notifier,

+    .guest_notifier = virtio_pci_guest_notifier,

 };

 static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,

-- 

1.6.6.144.g5c3af