[PATCH 07/11] conf: rename virDomainPCIAddressReserveAddr() to ...Internal()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is in preparation for renaming virDomainPCIAddressReserveSlot()
to virDomainPCIAddressReserveAddr(), which is a better description of
what it does.
---
 src/conf/domain_addr.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 07a4312..28b3604 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -476,10 +476,10 @@ virDomainPCIAddressSlotInUse(virDomainPCIAddressSetPtr addrs,
  * XML).
  */
 static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-virDomainPCIAddressReserveAddr(virDomainPCIAddressSetPtr addrs,
-                               virPCIDeviceAddressPtr addr,
-                               virDomainPCIConnectFlags flags,
-                               bool fromConfig)
+virDomainPCIAddressReserveAddrInternal(virDomainPCIAddressSetPtr addrs,
+                                       virPCIDeviceAddressPtr addr,
+                                       virDomainPCIConnectFlags flags,
+                                       bool fromConfig)
 {
     int ret = -1;
     char *addrStr = NULL;
@@ -533,7 +533,7 @@ virDomainPCIAddressReserveSlot(virDomainPCIAddressSetPtr addrs,
                                virPCIDeviceAddressPtr addr,
                                virDomainPCIConnectFlags flags)
 {
-    return virDomainPCIAddressReserveAddr(addrs, addr, flags, true);
+    return virDomainPCIAddressReserveAddrInternal(addrs, addr, flags, true);
 }
 
 int
@@ -568,8 +568,8 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
                                          addrStr, flags, true))
             goto cleanup;
 
-        ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci,
-                                             flags, true);
+        ret = virDomainPCIAddressReserveAddrInternal(addrs, &dev->addr.pci,
+                                                     flags, true);
     } else {
         ret = virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
     }
@@ -824,7 +824,7 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
     if (virDomainPCIAddressGetNextAddr(addrs, &addr, function, flags) < 0)
         return -1;
 
-    if (virDomainPCIAddressReserveAddr(addrs, &addr, flags, false) < 0)
+    if (virDomainPCIAddressReserveAddrInternal(addrs, &addr, flags, false) < 0)
         return -1;
 
     addrs->lastaddr = addr;
-- 
2.7.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]