[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 02/10] Revert "virtio-mmio: add support for configure interrupt
|
From: |
Michael S. Tsirkin |
|
Subject: |
[PULL v2 02/10] Revert "virtio-mmio: add support for configure interrupt" |
|
Date: |
Mon, 10 Jan 2022 16:04:52 -0500 |
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>
---
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;
--
MST
- [PULL v2 00/10] virtio: revert config interrupt changes, Michael S. Tsirkin, 2022/01/10
- [PULL v2 01/10] Revert "virtio-pci: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL v2 03/10] Revert "virtio-net: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL v2 02/10] Revert "virtio-mmio: add support for configure interrupt",
Michael S. Tsirkin <=
- [PULL v2 04/10] Revert "vhost: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL v2 05/10] Revert "virtio: add support for configure interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL v2 10/10] Revert "virtio: introduce macro IRTIO_CONFIG_IRQ_IDX", Michael S. Tsirkin, 2022/01/10
- [PULL v2 07/10] Revert "vhost: introduce new VhostOps vhost_set_config_call", Michael S. Tsirkin, 2022/01/10
- [PULL v2 09/10] Revert "virtio-pci: decouple notifier from interrupt process", Michael S. Tsirkin, 2022/01/10
- [PULL v2 06/10] Revert "vhost-vdpa: add support for config interrupt", Michael S. Tsirkin, 2022/01/10
- [PULL v2 08/10] Revert "virtio-pci: decouple the single vector from the interrupt process", Michael S. Tsirkin, 2022/01/10
- Re: [PULL v2 00/10] virtio: revert config interrupt changes, Peter Maydell, 2022/01/11