Re: [PATCH V4 23/43] vfio/pci: export MSI functions

[Cédric Le Goater]

On 5/29/25 21:24, Steve Sistare wrote:

Export various MSI functions, renamed with a vfio_pci prefix, for use by
CPR in subsequent patches.  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/pci.h |  8 ++++++++
  hw/vfio/pci.c | 29 +++++++++++++++++------------
  2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index 5ce0fb9..6e4840d 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -210,6 +210,14 @@ static inline bool vfio_is_vga(VFIOPCIDevice *vdev)
      return class == PCI_CLASS_DISPLAY_VGA;
  }

+/* MSI/MSI-X/INTx */

+void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr);
+void vfio_pci_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,
+                               int vector_n, bool msix);
+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);
+
  uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
  void vfio_pci_write_config(PCIDevice *pdev,
                             uint32_t addr, uint32_t val, int len);
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 6aa37fe..13d7c84 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -351,6 +351,11 @@ static void vfio_intx_disable(VFIOPCIDevice *vdev)
      trace_vfio_intx_disable(vdev->vbasedev.name);
  }

+bool vfio_pci_intx_enable(VFIOPCIDevice *vdev, Error **errp)

+{
+    return vfio_intx_enable(vdev, errp);
+}
+
  /*
   * MSI/X
   */
@@ -475,8 +480,8 @@ static int vfio_enable_vectors(VFIOPCIDevice *vdev, bool 
msix)
      return ret;
  }

-static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,

-                                  int vector_n, bool msix)
+void vfio_pci_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,
+                               int vector_n, bool msix)
  {
      if ((msix && vdev->no_kvm_msix) || (!msix && vdev->no_kvm_msi)) {
          return;
@@ -530,7 +535,7 @@ static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, 
MSIMessage msg,
      kvm_irqchip_commit_routes(kvm_state);
  }

-static void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr)

+void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr)
  {
      VFIOMSIVector *vector = &vdev->msi_vectors[nr];
      PCIDevice *pdev = &vdev->pdev;
@@ -580,10 +585,10 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, 
unsigned int nr,
      } else {
          if (msg) {
              if (vdev->defer_kvm_irq_routing) {
-                vfio_add_kvm_msi_virq(vdev, vector, nr, true);
+                vfio_pci_add_kvm_msi_virq(vdev, vector, nr, true);
              } else {
                  vfio_route_change = 
kvm_irqchip_begin_route_changes(kvm_state);
-                vfio_add_kvm_msi_virq(vdev, vector, nr, true);
+                vfio_pci_add_kvm_msi_virq(vdev, vector, nr, true);
                  kvm_irqchip_commit_route_changes(&vfio_route_change);
                  vfio_connect_kvm_msi_virq(vector, nr);
              }
@@ -676,14 +681,14 @@ static void vfio_msix_vector_release(PCIDevice *pdev, 
unsigned int nr)
      }
  }

-static void vfio_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev)

+void vfio_pci_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev)
  {
      assert(!vdev->defer_kvm_irq_routing);
      vdev->defer_kvm_irq_routing = true;
      vfio_route_change = kvm_irqchip_begin_route_changes(kvm_state);
  }

-static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev)

+void vfio_pci_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev)
  {
      int i;

@@ -713,14 +718,14 @@ static void vfio_msix_enable(VFIOPCIDevice *vdev)

       * routes once rather than per vector provides a substantial
       * performance improvement.
       */
-    vfio_prepare_kvm_msi_virq_batch(vdev);
+    vfio_pci_prepare_kvm_msi_virq_batch(vdev);

if (msix_set_vector_notifiers(&vdev->pdev, vfio_msix_vector_use,

                                    vfio_msix_vector_release, NULL)) {
          error_report("vfio: msix_set_vector_notifiers failed");
      }

- vfio_commit_kvm_msi_virq_batch(vdev);

+    vfio_pci_commit_kvm_msi_virq_batch(vdev);

if (vdev->nr_vectors) {

          ret = vfio_enable_vectors(vdev, true);
@@ -764,7 +769,7 @@ retry:
       * Deferring to commit the KVM routes once rather than per vector
       * provides a substantial performance improvement.
       */
-    vfio_prepare_kvm_msi_virq_batch(vdev);
+    vfio_pci_prepare_kvm_msi_virq_batch(vdev);

vdev->msi_vectors = g_new0(VFIOMSIVector, vdev->nr_vectors); @@ -788,10 +793,10 @@ retry:

           * Attempt to enable route through KVM irqchip,
           * default to userspace handling if unavailable.
           */
-        vfio_add_kvm_msi_virq(vdev, vector, i, false);
+        vfio_pci_add_kvm_msi_virq(vdev, vector, i, false);
      }

- vfio_commit_kvm_msi_virq_batch(vdev);

+    vfio_pci_commit_kvm_msi_virq_batch(vdev);

/* Set interrupt type prior to possible interrupts */

      vdev->interrupt = VFIO_INT_MSI;