|
 |
5c27b6 |
From 8a5a8820ea8d67af38bd3100788fb413478f271d Mon Sep 17 00:00:00 2001
|
|
|
5c27b6 |
Message-Id: <8a5a8820ea8d67af38bd3100788fb413478f271d@dist-git>
|
|
|
5c27b6 |
From: Laine Stump <laine@laine.org>
|
|
|
5c27b6 |
Date: Thu, 13 Apr 2017 14:29:39 -0400
|
|
|
5c27b6 |
Subject: [PATCH] util: rename virHostdevNetConfigRestore() to
|
|
|
5c27b6 |
virHostdevRestoreNetConfig()
|
|
|
5c27b6 |
|
|
|
5c27b6 |
(cherry picked from commit 43da69158249318a7127ddca6a1813f03b18259c)
|
|
|
5c27b6 |
|
|
|
5c27b6 |
https://bugzilla.redhat.com/1442040
|
|
|
5c27b6 |
---
|
|
|
5c27b6 |
src/util/virhostdev.c | 8 ++++----
|
|
|
5c27b6 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
5c27b6 |
|
|
|
5c27b6 |
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
|
|
|
5c27b6 |
index fe87fa7d7..6c7f47b17 100644
|
|
|
5c27b6 |
--- a/src/util/virhostdev.c
|
|
|
5c27b6 |
+++ b/src/util/virhostdev.c
|
|
|
5c27b6 |
@@ -500,7 +500,7 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
|
|
|
5c27b6 |
* case, try to find in the old state dir.
|
|
|
5c27b6 |
*/
|
|
|
5c27b6 |
static int
|
|
|
5c27b6 |
-virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
|
|
|
5c27b6 |
+virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
|
|
|
5c27b6 |
const char *stateDir,
|
|
|
5c27b6 |
const char *oldStateDir)
|
|
|
5c27b6 |
{
|
|
|
5c27b6 |
@@ -839,7 +839,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
|
|
|
5c27b6 |
resetvfnetconfig:
|
|
|
5c27b6 |
if (last_processed_hostdev_vf >= 0) {
|
|
|
5c27b6 |
for (i = 0; i <= last_processed_hostdev_vf; i++)
|
|
|
5c27b6 |
- virHostdevNetConfigRestore(hostdevs[i], mgr->stateDir, NULL);
|
|
|
5c27b6 |
+ virHostdevRestoreNetConfig(hostdevs[i], mgr->stateDir, NULL);
|
|
|
5c27b6 |
}
|
|
|
5c27b6 |
|
|
|
5c27b6 |
reattachdevs:
|
|
|
5c27b6 |
@@ -900,7 +900,7 @@ virHostdevReattachPCIDevice(virHostdevManagerPtr mgr,
|
|
|
5c27b6 |
}
|
|
|
5c27b6 |
|
|
|
5c27b6 |
/* @oldStateDir:
|
|
|
5c27b6 |
- * For upgrade purpose: see virHostdevNetConfigRestore
|
|
|
5c27b6 |
+ * For upgrade purpose: see virHostdevRestoreNetConfig
|
|
|
5c27b6 |
*/
|
|
|
5c27b6 |
void
|
|
|
5c27b6 |
virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
|
|
|
5c27b6 |
@@ -1001,7 +1001,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr,
|
|
|
5c27b6 |
if (actual) {
|
|
|
5c27b6 |
VIR_DEBUG("Restoring network configuration of PCI device %s",
|
|
|
5c27b6 |
virPCIDeviceGetName(actual));
|
|
|
5c27b6 |
- virHostdevNetConfigRestore(hostdev, mgr->stateDir,
|
|
|
5c27b6 |
+ virHostdevRestoreNetConfig(hostdev, mgr->stateDir,
|
|
|
5c27b6 |
oldStateDir);
|
|
|
5c27b6 |
}
|
|
|
5c27b6 |
}
|
|
|
5c27b6 |
--
|
|
|
5c27b6 |
2.12.2
|
|
|
5c27b6 |
|