From: Laine Stump <laine@laine.org>
Date: Sun, 23 Oct 2016 16:07:20 +0000 (-0400)
Subject: conf: rename virDomainPCIAddressReserveAddr() to ...Internal()
X-Git-Tag: v3.0.0-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=640ce186796b3c8f9b695606dfa8c3d816910910;p=thirdparty%2Flibvirt.git

conf: rename virDomainPCIAddressReserveAddr() to ...Internal()

This is in preparation for renaming virDomainPCIAddressReserveSlot()
to virDomainPCIAddressReserveAddr(), which is a better description of
what it does.
---

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index ff7d15ffb0..94496484df 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -534,10 +534,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;
@@ -591,7 +591,7 @@ virDomainPCIAddressReserveSlot(virDomainPCIAddressSetPtr addrs,
                                virPCIDeviceAddressPtr addr,
                                virDomainPCIConnectFlags flags)
 {
-    return virDomainPCIAddressReserveAddr(addrs, addr, flags, true);
+    return virDomainPCIAddressReserveAddrInternal(addrs, addr, flags, true);
 }
 
 int
@@ -626,8 +626,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);
     }
@@ -882,7 +882,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;