Re: [PATCH V1 1/2] vfio/pci: augment set_handler

[Cédric Le Goater]

On 7/14/25 16:27, Steve Sistare wrote:

Extend vfio_pci_msi_set_handler() so it can set or clear the handler.
Add a similar accessor for INTx.  No functional change.

Signed-off-by: Steve Sistare <steven.sist...@oracle.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/vfio/cpr.c |  2 +-
  hw/vfio/pci.c | 13 +++++++++++--
  hw/vfio/pci.h |  3 ++-
  3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/hw/vfio/cpr.c b/hw/vfio/cpr.c
index af0f12a7ad..2a244fc4b6 100644
--- a/hw/vfio/cpr.c
+++ b/hw/vfio/cpr.c
@@ -70,7 +70,7 @@ static void vfio_cpr_claim_vectors(VFIOPCIDevice *vdev, int 
nr_vectors,
          fd = vfio_cpr_load_vector_fd(vdev, "interrupt", i);
          if (fd >= 0) {
              vfio_pci_vector_init(vdev, i);
-            vfio_pci_msi_set_handler(vdev, i);
+            vfio_pci_msi_set_handler(vdev, i, true);
          }

if (vfio_cpr_load_vector_fd(vdev, "kvm_interrupt", i) >= 0) {

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 1093b28df7..8b471c054a 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -415,6 +415,14 @@ bool vfio_pci_intx_enable(VFIOPCIDevice *vdev, Error 
**errp)
      return vfio_intx_enable(vdev, errp);
  }

+void vfio_pci_intx_set_handler(VFIOPCIDevice *vdev, bool enable)

+{
+    int fd = event_notifier_get_fd(&vdev->intx.interrupt);
+    IOHandler *handler = (enable ? vfio_intx_interrupt : NULL);
+
+    qemu_set_fd_handler(fd, handler, NULL, vdev);
+}
+
  /*
   * MSI/X
   */
@@ -453,12 +461,13 @@ static void vfio_msi_interrupt(void *opaque)
      notify(&vdev->pdev, nr);
  }

-void vfio_pci_msi_set_handler(VFIOPCIDevice *vdev, int nr)

+void vfio_pci_msi_set_handler(VFIOPCIDevice *vdev, int nr, bool enable)
  {
      VFIOMSIVector *vector = &vdev->msi_vectors[nr];
      int fd = event_notifier_get_fd(&vector->interrupt);
+    IOHandler *handler = (enable ? vfio_msi_interrupt : NULL);

- qemu_set_fd_handler(fd, vfio_msi_interrupt, NULL, vector);

+    qemu_set_fd_handler(fd, handler, NULL, vector);
  }

/*

diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 495fae737d..80c8fcfa07 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -218,8 +218,9 @@ void vfio_pci_add_kvm_msi_virq(VFIOPCIDevice *vdev, 
VFIOMSIVector *vector,
  void vfio_pci_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev);
  void vfio_pci_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev);
  bool vfio_pci_intx_enable(VFIOPCIDevice *vdev, Error **errp);
+void vfio_pci_intx_set_handler(VFIOPCIDevice *vdev, bool enable);
  void vfio_pci_msix_set_notifiers(VFIOPCIDevice *vdev);
-void vfio_pci_msi_set_handler(VFIOPCIDevice *vdev, int nr);
+void vfio_pci_msi_set_handler(VFIOPCIDevice *vdev, int nr, bool enable);

uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);

  void vfio_pci_write_config(PCIDevice *pdev,