From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Mon, 4 Jan 2021 12:54:42 +0000 (-0300)
Subject: virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListSteal()
X-Git-Tag: v7.2.0-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de80a10738055bba79b54b4efee063b25162c91f;p=thirdparty%2Flibvirt.git

virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListSteal()

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index c41ba26cc7..11423fa6da 100644
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -822,7 +822,7 @@ virHostdevPreparePCIDevicesImpl(virHostdevManagerPtr mgr,
 
         VIR_DEBUG("Removing PCI device %s from inactive list",
                   virPCIDeviceGetName(pci));
-        actual = virPCIDeviceListSteal(mgr->inactivePCIHostdevs, pci);
+        actual = virPCIDeviceListSteal(mgr->inactivePCIHostdevs, virPCIDeviceGetAddress(pci));
 
         VIR_DEBUG("Adding PCI device %s to active list",
                   virPCIDeviceGetName(pci));
@@ -894,7 +894,8 @@ virHostdevPreparePCIDevicesImpl(virHostdevManagerPtr mgr,
 
         VIR_DEBUG("Removing PCI device %s from active list",
                   virPCIDeviceGetName(pci));
-        if (!(actual = virPCIDeviceListSteal(mgr->activePCIHostdevs, pci)))
+        if (!(actual = virPCIDeviceListSteal(mgr->activePCIHostdevs,
+                                             virPCIDeviceGetAddress(pci))))
             continue;
 
         VIR_DEBUG("Adding PCI device %s to inactive list",
@@ -997,7 +998,8 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManagerPtr mgr,
 
         VIR_DEBUG("Removing PCI device %s from active list",
                   virPCIDeviceGetName(pci));
-        actual = virPCIDeviceListSteal(mgr->activePCIHostdevs, pci);
+        actual = virPCIDeviceListSteal(mgr->activePCIHostdevs,
+                                       virPCIDeviceGetAddress(pci));
 
         VIR_DEBUG("Adding PCI device %s to inactive list",
                   virPCIDeviceGetName(pci));
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 516187a097..1de62ccede 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1743,16 +1743,16 @@ virPCIDeviceListStealIndex(virPCIDeviceListPtr list,
 
 virPCIDevicePtr
 virPCIDeviceListSteal(virPCIDeviceListPtr list,
-                      virPCIDevicePtr dev)
+                      virPCIDeviceAddressPtr devAddr)
 {
-    return virPCIDeviceListStealIndex(list, virPCIDeviceListFindIndex(list, &dev->address));
+    return virPCIDeviceListStealIndex(list, virPCIDeviceListFindIndex(list, devAddr));
 }
 
 void
 virPCIDeviceListDel(virPCIDeviceListPtr list,
                     virPCIDevicePtr dev)
 {
-    virPCIDeviceFree(virPCIDeviceListSteal(list, dev));
+    virPCIDeviceFree(virPCIDeviceListSteal(list, &dev->address));
 }
 
 int
diff --git a/src/util/virpci.h b/src/util/virpci.h
index 0b75cd17fe..6c59c67d7f 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -166,7 +166,7 @@ virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list,
                                     int idx);
 size_t virPCIDeviceListCount(virPCIDeviceListPtr list);
 virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list,
-                                      virPCIDevicePtr dev);
+                                      virPCIDeviceAddressPtr devAddr);
 virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list,
                                            int idx);
 void virPCIDeviceListDel(virPCIDeviceListPtr list,