103 lines
3.6 KiB
Diff
103 lines
3.6 KiB
Diff
From 90152f58401b828febbb060cff86330827e6befe Mon Sep 17 00:00:00 2001
|
|
From: Cindy Lu <lulu@redhat.com>
|
|
Date: Thu, 22 Dec 2022 15:04:47 +0800
|
|
Subject: [PATCH] virtio: add support for configure interrupt
|
|
|
|
Add the functions to support the configure interrupt in virtio
|
|
The function virtio_config_guest_notifier_read will notify the
|
|
guest if there is an configure interrupt.
|
|
The function virtio_config_set_guest_notifier_fd_handler is
|
|
to set the fd hander for the notifier
|
|
|
|
Signed-off-by: Cindy Lu <lulu@redhat.com>
|
|
Message-Id: <20221222070451.936503-7-lulu@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/virtio.c | 29 +++++++++++++++++++++++++++++
|
|
include/hw/virtio/virtio.h | 4 ++++
|
|
2 files changed, 33 insertions(+)
|
|
|
|
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
index 12f4a8ab3d..e3f392fc59 100644
|
|
--- a/hw/virtio/virtio.c
|
|
+++ b/hw/virtio/virtio.c
|
|
@@ -3548,7 +3548,14 @@ static void virtio_queue_guest_notifier_read(EventNotifier *n)
|
|
virtio_irq(vq);
|
|
}
|
|
}
|
|
+static void virtio_config_guest_notifier_read(EventNotifier *n)
|
|
+{
|
|
+ VirtIODevice *vdev = container_of(n, VirtIODevice, config_notifier);
|
|
|
|
+ if (event_notifier_test_and_clear(n)) {
|
|
+ virtio_notify_config(vdev);
|
|
+ }
|
|
+}
|
|
void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
|
|
bool with_irqfd)
|
|
{
|
|
@@ -3565,6 +3572,23 @@ void virtio_queue_set_guest_notifier_fd_handler(VirtQueue *vq, bool assign,
|
|
}
|
|
}
|
|
|
|
+void virtio_config_set_guest_notifier_fd_handler(VirtIODevice *vdev,
|
|
+ bool assign, bool with_irqfd)
|
|
+{
|
|
+ EventNotifier *n;
|
|
+ n = &vdev->config_notifier;
|
|
+ if (assign && !with_irqfd) {
|
|
+ event_notifier_set_handler(n, virtio_config_guest_notifier_read);
|
|
+ } else {
|
|
+ event_notifier_set_handler(n, NULL);
|
|
+ }
|
|
+ if (!assign) {
|
|
+ /* Test and clear notifier before closing it,*/
|
|
+ /* in case poll callback didn't have time to run. */
|
|
+ virtio_config_guest_notifier_read(n);
|
|
+ }
|
|
+}
|
|
+
|
|
EventNotifier *virtio_queue_get_guest_notifier(VirtQueue *vq)
|
|
{
|
|
return &vq->guest_notifier;
|
|
@@ -3638,6 +3662,11 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq)
|
|
return &vq->host_notifier;
|
|
}
|
|
|
|
+EventNotifier *virtio_config_get_guest_notifier(VirtIODevice *vdev)
|
|
+{
|
|
+ return &vdev->config_notifier;
|
|
+}
|
|
+
|
|
void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled)
|
|
{
|
|
vq->host_notifier_enabled = enabled;
|
|
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
|
|
index 91d1c3433a..43509b33ff 100644
|
|
--- a/include/hw/virtio/virtio.h
|
|
+++ b/include/hw/virtio/virtio.h
|
|
@@ -114,6 +114,7 @@ struct VirtIODevice
|
|
bool use_guest_notifier_mask;
|
|
AddressSpace *dma_as;
|
|
QLIST_HEAD(, VirtQueue) *vector_queues;
|
|
+ EventNotifier config_notifier;
|
|
};
|
|
|
|
struct VirtioDeviceClass {
|
|
@@ -329,6 +330,9 @@ void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,
|
|
VirtIOHandleAIOOutput handle_output);
|
|
VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector);
|
|
VirtQueue *virtio_vector_next_queue(VirtQueue *vq);
|
|
+EventNotifier *virtio_config_get_guest_notifier(VirtIODevice *vdev);
|
|
+void virtio_config_set_guest_notifier_fd_handler(VirtIODevice *vdev,
|
|
+ bool assign, bool with_irqfd);
|
|
|
|
static inline void virtio_add_feature(uint64_t *features, unsigned int fbit)
|
|
{
|
|
--
|
|
2.27.0
|
|
|