render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
Blob Blame History Raw
From 8a5a8820ea8d67af38bd3100788fb413478f271d Mon Sep 17 00:00:00 2001
Message-Id: <8a5a8820ea8d67af38bd3100788fb413478f271d@dist-git>
From: Laine Stump <laine@laine.org>
Date: Thu, 13 Apr 2017 14:29:39 -0400
Subject: [PATCH] util: rename virHostdevNetConfigRestore() to
 virHostdevRestoreNetConfig()

(cherry picked from commit 43da69158249318a7127ddca6a1813f03b18259c)

https://bugzilla.redhat.com/1442040
---
 src/util/virhostdev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index fe87fa7d7..6c7f47b17 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -500,7 +500,7 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
  * case, try to find in the old state dir.
  */
 static int
-virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
+virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
                            const char *stateDir,
                            const char *oldStateDir)
 {
@@ -839,7 +839,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
  resetvfnetconfig:
     if (last_processed_hostdev_vf >= 0) {
         for (i = 0; i <= last_processed_hostdev_vf; i++)
-            virHostdevNetConfigRestore(hostdevs[i], mgr->stateDir, NULL);
+            virHostdevRestoreNetConfig(hostdevs[i], mgr->stateDir, NULL);
     }
 
  reattachdevs:
@@ -900,7 +900,7 @@ virHostdevReattachPCIDevice(virHostdevManagerPtr mgr,
 }
 
 /* @oldStateDir:
- * For upgrade purpose: see virHostdevNetConfigRestore
+ * For upgrade purpose: see virHostdevRestoreNetConfig
  */
 void
 virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
@@ -1001,7 +1001,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
             if (actual) {
                 VIR_DEBUG("Restoring network configuration of PCI device %s",
                           virPCIDeviceGetName(actual));
-                virHostdevNetConfigRestore(hostdev, mgr->stateDir,
+                virHostdevRestoreNetConfig(hostdev, mgr->stateDir,
                                            oldStateDir);
             }
         }
-- 
2.12.2