From: John Ferlan <jferlan@redhat.com>
Date: Tue, 30 May 2017 19:59:24 +0000 (-0400)
Subject: nwfilter: Rename _virNWFilterInstantiateFilter
X-Git-Tag: v3.6.0-rc1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cceb220f7c065ac5c272322e7de14992c97ba45;p=thirdparty%2Flibvirt.git

nwfilter: Rename _virNWFilterInstantiateFilter

New API will be virNWFilterInstantiateFilterInternal as it's called from
the virNWFilterInstantiateFilter and virNWFilterUpdateInstantiateFilter.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 7ad22cec60..46d13f0f8e 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -891,12 +891,12 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver,
 
 
 static int
-_virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-                              const unsigned char *vmuuid,
-                              const virDomainNetDef *net,
-                              bool teardownOld,
-                              enum instCase useNewFilter,
-                              bool *foundNewFilter)
+virNWFilterInstantiateFilterInternal(virNWFilterDriverStatePtr driver,
+                                     const unsigned char *vmuuid,
+                                     const virDomainNetDef *net,
+                                     bool teardownOld,
+                                     enum instCase useNewFilter,
+                                     bool *foundNewFilter)
 {
     const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT)
                           ? net->data.direct.linkdev
@@ -976,10 +976,10 @@ virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
 {
     bool foundNewFilter = false;
 
-    return _virNWFilterInstantiateFilter(driver, vmuuid, net,
-                                         1,
-                                         INSTANTIATE_ALWAYS,
-                                         &foundNewFilter);
+    return virNWFilterInstantiateFilterInternal(driver, vmuuid, net,
+                                                1,
+                                                INSTANTIATE_ALWAYS,
+                                                &foundNewFilter);
 }
 
 
@@ -991,10 +991,10 @@ virNWFilterUpdateInstantiateFilter(virNWFilterDriverStatePtr driver,
 {
     bool foundNewFilter = false;
 
-    int rc = _virNWFilterInstantiateFilter(driver, vmuuid, net,
-                                           0,
-                                           INSTANTIATE_FOLLOW_NEWFILTER,
-                                           &foundNewFilter);
+    int rc = virNWFilterInstantiateFilterInternal(driver, vmuuid, net,
+                                                  0,
+                                                  INSTANTIATE_FOLLOW_NEWFILTER,
+                                                  &foundNewFilter);
 
     *skipIface = !foundNewFilter;
     return rc;