conf: eliminate virDomainPCIAddressReserveNextSlot()

Since we don't actually reserve an entire slot at a time anymore, the
name of this function is just confusing, and it's almost identical in
operation to virDomainPCIAddressReserveNextAddr() anyway, so remove
the *Slot() function and replace calls to it with calls to *Addr(...,
-1).

diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c
index ca30e9f462bb7fc46967b1fc9bc2df87e50dc19d..4a1e1bd8cad572787b966ae4c91683126fcc7824 100644 (file)
--- a/src/bhyve/bhyve_device.c
+++ b/src/bhyve/bhyve_device.c
@@ -100,19 +100,20 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
     for (i = 0; i < def->nnets; i++) {
         if (!virDeviceInfoPCIAddressWanted(&def->nets[i]->info))
             continue;
-        if (virDomainPCIAddressReserveNextSlot(addrs,
-                                               &def->nets[i]->info,
-                                               VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0)
+        if (virDomainPCIAddressReserveNextAddr(addrs, &def->nets[i]->info,
+                                               VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
+                                               -1) < 0) {
             goto error;
+        }
     }
 
     for (i = 0; i < def->ndisks; i++) {
         if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
             !virPCIDeviceAddressIsEmpty(&def->disks[i]->info.addr.pci))
             continue;
-        if (virDomainPCIAddressReserveNextSlot(addrs,
-                                               &def->disks[i]->info,
-                                               VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0)
+        if (virDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info,
+                                               VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
+                                               -1) < 0)
             goto error;
     }
 
@@ -122,9 +123,10 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
                 !virDeviceInfoPCIAddressWanted(&def->controllers[i]->info))
                 continue;
 
-            if (virDomainPCIAddressReserveNextSlot(addrs,
+            if (virDomainPCIAddressReserveNextAddr(addrs,
                                                    &def->controllers[i]->info,
-                                                   VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0)
+                                                   VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
+                                                   -1) < 0)
                 goto error;
         }
 

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 58cb8048befce65c2cfba9514747ab2e30df0174..91e6c8e96f803beaf2b9e77ed1214c397f179948 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -629,7 +629,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
         ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci,
                                              flags, true);
     } else {
-        ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags);
+        ret = virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
     }
 
  cleanup:
@@ -897,15 +897,6 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
 }
 
 
-int
-virDomainPCIAddressReserveNextSlot(virDomainPCIAddressSetPtr addrs,
-                                   virDomainDeviceInfoPtr dev,
-                                   virDomainPCIConnectFlags flags)
-{
-    return virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
-}
-
-
 static int
 virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED,
                                 virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,

diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
index 4e295cefb0990bef33d5eeff3696fa49128fd31d..3795622044d5fa3cf0ae628fc918fe6388312d7c 100644 (file)
--- a/src/conf/domain_addr.h
+++ b/src/conf/domain_addr.h
@@ -180,11 +180,6 @@ int virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
                                        int function)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-int virDomainPCIAddressReserveNextSlot(virDomainPCIAddressSetPtr addrs,
-                                       virDomainDeviceInfoPtr dev,
-                                       virDomainPCIConnectFlags flags)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)
     ATTRIBUTE_NONNULL(1);
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4d2f85cc3da4466e48d19749a54fe0530bbb816d..069b5a680e2b5a0764011108dcdd99bdac112562 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -102,7 +102,6 @@ virDomainPCIAddressFlagsCompatible;
 virDomainPCIAddressReleaseSlot;
 virDomainPCIAddressReserveAddr;
 virDomainPCIAddressReserveNextAddr;
-virDomainPCIAddressReserveNextSlot;
 virDomainPCIAddressReserveSlot;
 virDomainPCIAddressSetAllMulti;
 virDomainPCIAddressSetAlloc;