65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From 9633634fe4395000e88c8ab829ec756c7132d3bf Mon Sep 17 00:00:00 2001
|
|
From: fangyi <eric.fangyi@huawei.com>
|
|
Date: Wed, 22 Nov 2023 09:48:17 +0800
|
|
Subject: [PATCH] Revert "virtio-mmio: add support for configure interrupt"
|
|
|
|
This reverts commit d48185f1a40d4e4ed2fa2873a42b2a5eb8748256.
|
|
|
|
Fixes: d48185f1a4 ("virtio-mmio: add support for configure interrupt")
|
|
Cc: "Cindy Lu" <lulu@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/virtio-mmio.c | 27 ---------------------------
|
|
1 file changed, 27 deletions(-)
|
|
|
|
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
|
|
index 809132018b..72da12fea5 100644
|
|
--- a/hw/virtio/virtio-mmio.c
|
|
+++ b/hw/virtio/virtio-mmio.c
|
|
@@ -673,30 +673,7 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign,
|
|
|
|
return 0;
|
|
}
|
|
-static int virtio_mmio_set_config_guest_notifier(DeviceState *d, bool assign)
|
|
-{
|
|
- VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d);
|
|
- VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
|
- VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
|
|
- bool with_irqfd = false;
|
|
- EventNotifier *notifier = virtio_config_get_guest_notifier(vdev);
|
|
- int r = 0;
|
|
|
|
- if (assign) {
|
|
- r = event_notifier_init(notifier, 0);
|
|
- if (r < 0) {
|
|
- return r;
|
|
- }
|
|
- virtio_config_set_guest_notifier_fd_handler(vdev, assign, with_irqfd);
|
|
- } else {
|
|
- virtio_config_set_guest_notifier_fd_handler(vdev, assign, with_irqfd);
|
|
- event_notifier_cleanup(notifier);
|
|
- }
|
|
- if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) {
|
|
- vdc->guest_notifier_mask(vdev, VIRTIO_CONFIG_IRQ_IDX, !assign);
|
|
- }
|
|
- return r;
|
|
-}
|
|
static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
|
|
bool assign)
|
|
{
|
|
@@ -718,10 +695,6 @@ static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs,
|
|
goto assign_error;
|
|
}
|
|
}
|
|
- r = virtio_mmio_set_config_guest_notifier(d, assign);
|
|
- if (r < 0) {
|
|
- goto assign_error;
|
|
- }
|
|
|
|
return 0;
|
|
|
|
--
|
|
2.27.0
|
|
|