From ac811766145561f0d1bf6fe4886bae511532cb2f Mon Sep 17 00:00:00 2001
From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Mon, 4 Jan 2021 09:54:43 -0300
Subject: [PATCH] virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListDel()

This change will allow us to remove PCI devices from a list
without the need of a PCI Device object, which will be need
in the next patch.

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 src/hypervisor/virhostdev.c | 7 ++++---
 src/util/virpci.c           | 6 +++---
 src/util/virpci.h           | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index 11423fa6da..7ff25442a9 100644
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -980,11 +980,11 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManagerPtr mgr,
             if (STRNEQ_NULLABLE(drv_name, actual_drvname) ||
                 STRNEQ_NULLABLE(dom_name, actual_domname)) {
 
-                virPCIDeviceListDel(pcidevs, pci);
+                virPCIDeviceListDel(pcidevs, virPCIDeviceGetAddress(pci));
                 continue;
             }
         } else {
-            virPCIDeviceListDel(pcidevs, pci);
+            virPCIDeviceListDel(pcidevs, virPCIDeviceGetAddress(pci));
             continue;
         }
 
@@ -2486,7 +2486,8 @@ virHostdevUpdateActiveNVMeDevices(virHostdevManagerPtr hostdev_mgr,
     while (lastGoodPCIIdx >= 0) {
         virPCIDevicePtr actual = virPCIDeviceListGet(pciDevices, i);
 
-        virPCIDeviceListDel(hostdev_mgr->activePCIHostdevs, actual);
+        virPCIDeviceListDel(hostdev_mgr->activePCIHostdevs,
+                            virPCIDeviceGetAddress(actual));
 
         lastGoodPCIIdx--;
     }
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 1de62ccede..8c144494c6 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1336,7 +1336,7 @@ virPCIDeviceReattach(virPCIDevicePtr dev,
     /* Steal the dev from list inactiveDevs */
     if (inactiveDevs) {
         VIR_DEBUG("Removing PCI device %s from inactive list", dev->name);
-        virPCIDeviceListDel(inactiveDevs, dev);
+        virPCIDeviceListDel(inactiveDevs, &dev->address);
     }
 
     return 0;
@@ -1750,9 +1750,9 @@ virPCIDeviceListSteal(virPCIDeviceListPtr list,
 
 void
 virPCIDeviceListDel(virPCIDeviceListPtr list,
-                    virPCIDevicePtr dev)
+                    virPCIDeviceAddressPtr devAddr)
 {
-    virPCIDeviceFree(virPCIDeviceListSteal(list, &dev->address));
+    virPCIDeviceFree(virPCIDeviceListSteal(list, devAddr));
 }
 
 int
diff --git a/src/util/virpci.h b/src/util/virpci.h
index 6c59c67d7f..9b37a12883 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -170,7 +170,7 @@ virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list,
 virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list,
                                            int idx);
 void virPCIDeviceListDel(virPCIDeviceListPtr list,
-                         virPCIDevicePtr dev);
+                         virPCIDeviceAddressPtr devAddr);
 virPCIDevicePtr virPCIDeviceListFind(virPCIDeviceListPtr list,
                                      virPCIDeviceAddressPtr devAddr);
 virPCIDevicePtr