nwfilter: Replace virNWFilterSaveDef with virNWFilterSaveConfig

Essentially virNWFilterSaveDef executed in a different order the same
sequence of calls, so let's just make one point of reference.

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

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 2352e606b44f1e2d705a359e8d6a2da570bdc327..752d4e18a0c710d3626cc0f20c4274ebd9a9720f 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2931,43 +2931,6 @@ virNWFilterTriggerVMFilterRebuild(void)
 }
 
 
-int
-virNWFilterSaveDef(const char *configDir,
-                   virNWFilterDefPtr def)
-{
-    char uuidstr[VIR_UUID_STRING_BUFLEN];
-    char *xml;
-    int ret = -1;
-    char *configFile = NULL;
-
-    if (virFileMakePath(configDir) < 0) {
-        virReportSystemError(errno,
-                             _("cannot create config directory %s"),
-                             configDir);
-        goto error;
-    }
-
-    if (!(configFile = virFileBuildPath(configDir, def->name, ".xml")))
-        goto error;
-
-    if (!(xml = virNWFilterDefFormat(def))) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("failed to generate XML"));
-        goto error;
-    }
-
-    virUUIDFormat(def->uuid, uuidstr);
-    ret = virXMLSaveFile(configFile,
-                         virXMLPickShellSafeComment(def->name, uuidstr),
-                         "nwfilter-edit", xml);
-    VIR_FREE(xml);
-
- error:
-    VIR_FREE(configFile);
-    return ret;
-}
-
-
 int
 virNWFilterDeleteDef(const char *configDir,
                      virNWFilterDefPtr def)

diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 5bf9c3daaeefc224efe4c1428d21d3c8d749e5fa..5cac2604a82fdfcb2af6e71ba121298f86a453a9 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -569,10 +569,6 @@ virNWFilterDefFree(virNWFilterDefPtr def);
 int
 virNWFilterTriggerVMFilterRebuild(void);
 
-int
-virNWFilterSaveDef(const char *configDir,
-                   virNWFilterDefPtr def);
-
 int
 virNWFilterDeleteDef(const char *configDir,
                      virNWFilterDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 13f2ab94da4b7efda996b36d4a93dfa22ab92fab..170ecce7def22f759ad91d77861351b3563419e9 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -740,7 +740,7 @@ virNWFilterRuleIsProtocolEthernet;
 virNWFilterRuleIsProtocolIPv4;
 virNWFilterRuleIsProtocolIPv6;
 virNWFilterRuleProtocolTypeToString;
-virNWFilterSaveDef;
+virNWFilterSaveConfig;
 virNWFilterTriggerVMFilterRebuild;
 virNWFilterUnlockFilterUpdates;
 virNWFilterUnRegisterCallbackDriver;

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 781a7a06f580c1223de3569abed7164cd8237578..faa4fe8d25fdf495dfc041d4c9849df91d678753 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -510,7 +510,7 @@ nwfilterDefineXML(virConnectPtr conn,
     def = NULL;
     objdef = virNWFilterObjGetDef(obj);
 
-    if (virNWFilterSaveDef(driver->configDir, objdef) < 0) {
+    if (virNWFilterSaveConfig(driver->configDir, objdef) < 0) {
         virNWFilterObjListRemove(driver->nwfilters, obj);
         goto cleanup;
     }