Re: [PATCH V3 18/42] vfio/pci: pass vector to virq functions

[Cédric Le Goater]

On 5/12/25 17:32, Steve Sistare wrote:

Pass the vector number to vfio_connect_kvm_msi_virq and
vfio_remove_kvm_msi_virq, so it can be passed to their subroutines in
a subsequent patch.  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.c | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 4159deb..dad6209 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -477,7 +477,7 @@ static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, 
VFIOMSIVector *vector,
                                               vector_n, &vdev->pdev);
  }

-static void vfio_connect_kvm_msi_virq(VFIOMSIVector *vector)

+static void vfio_connect_kvm_msi_virq(VFIOMSIVector *vector, int nr)
  {
      const char *name = "kvm_interrupt";

@@ -503,7 +503,8 @@ fail_notifier:

      vector->virq = -1;
  }

-static void vfio_remove_kvm_msi_virq(VFIOMSIVector *vector)

+static void vfio_remove_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector 
*vector,
+                                     int nr)
  {
      kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vector->kvm_interrupt,
                                            vector->virq);
@@ -561,7 +562,7 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, 
unsigned int nr,
       */
      if (vector->virq >= 0) {
          if (!msg) {
-            vfio_remove_kvm_msi_virq(vector);
+            vfio_remove_kvm_msi_virq(vdev, vector, nr);
          } else {
              vfio_update_kvm_msi_virq(vector, *msg, pdev);
          }
@@ -573,7 +574,7 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, 
unsigned int nr,
                  vfio_route_change = 
kvm_irqchip_begin_route_changes(kvm_state);
                  vfio_add_kvm_msi_virq(vdev, vector, nr, true);
                  kvm_irqchip_commit_route_changes(&vfio_route_change);
-                vfio_connect_kvm_msi_virq(vector);
+                vfio_connect_kvm_msi_virq(vector, nr);
              }
          }
      }
@@ -681,7 +682,7 @@ static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice 
*vdev)
      kvm_irqchip_commit_route_changes(&vfio_route_change);

for (i = 0; i < vdev->nr_vectors; i++) {

-        vfio_connect_kvm_msi_virq(&vdev->msi_vectors[i]);
+        vfio_connect_kvm_msi_virq(&vdev->msi_vectors[i], i);
      }
  }

@@ -821,7 +822,7 @@ static void vfio_msi_disable_common(VFIOPCIDevice *vdev)

          VFIOMSIVector *vector = &vdev->msi_vectors[i];
          if (vdev->msi_vectors[i].use) {
              if (vector->virq >= 0) {
-                vfio_remove_kvm_msi_virq(vector);
+                vfio_remove_kvm_msi_virq(vdev, vector, i);
              }
              qemu_set_fd_handler(event_notifier_get_fd(&vector->interrupt),
                                  NULL, NULL, NULL);