From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 23 Aug 2019 09:45:01 +0000 (+0200)
Subject: virpci: Rename virPCIDevice{Bind,Unbind}FromStubWithOverride
X-Git-Tag: v5.7.0-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51f27ef789cfba7ede0516379549dfd666cc0c49;p=thirdparty%2Flibvirt.git

virpci: Rename virPCIDevice{Bind,Unbind}FromStubWithOverride

After my previous patches we have virPCIDeviceBindToStub() and
virPCIDeviceUnbindFromStub() which really do nothing but call
virPCIDeviceBindToStubWithOverride() and
virPCIDeviceUnbindFromStubWithOverride() respectively.
Drop "WithOverride" from the names and drop the thin wrappers.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 6724a8ad9e..ee78151e74 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1136,7 +1136,7 @@ virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev,
 }
 
 static int
-virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev)
+virPCIDeviceUnbindFromStub(virPCIDevicePtr dev)
 {
     if (!dev->unbind_from_stub) {
         VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name);
@@ -1147,13 +1147,7 @@ virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev)
 }
 
 static int
-virPCIDeviceUnbindFromStub(virPCIDevicePtr dev)
-{
-    return virPCIDeviceUnbindFromStubWithOverride(dev);
-}
-
-static int
-virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev)
+virPCIDeviceBindToStub(virPCIDevicePtr dev)
 {
     const char *stubDriverName;
     VIR_AUTOFREE(char *) stubDriverPath = NULL;
@@ -1192,12 +1186,6 @@ virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev)
     return 0;
 }
 
-static int
-virPCIDeviceBindToStub(virPCIDevicePtr dev)
-{
-    return virPCIDeviceBindToStubWithOverride(dev);
-}
-
 /* virPCIDeviceDetach:
  *
  * Detach this device from the host driver, attach it to the stub