External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Replace virNWFilterSaveDef with virNWFilterSaveConfig

Browse Source 
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>
This commit is contained in:
John Ferlan 2017-04-19 14:19:41 -04:00
parent 324fd3a33c
commit 119a6b3071
4 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/nwfilter_conf.c
View File

@ -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)

4
src/conf/nwfilter_conf.h
View File

@ -569,10 +569,6 @@ virNWFilterDefFree(virNWFilterDefPtr def);
int
virNWFilterTriggerVMFilterRebuild(void);
int
virNWFilterSaveDef(const char *configDir,
virNWFilterDefPtr def);
int
virNWFilterDeleteDef(const char *configDir,
virNWFilterDefPtr def);

2
src/libvirt_private.syms
View File

@ -740,7 +740,7 @@ virNWFilterRuleIsProtocolEthernet;
virNWFilterRuleIsProtocolIPv4;
virNWFilterRuleIsProtocolIPv6;
virNWFilterRuleProtocolTypeToString;
virNWFilterSaveDef;
virNWFilterSaveConfig;
virNWFilterTriggerVMFilterRebuild;
virNWFilterUnlockFilterUpdates;
virNWFilterUnRegisterCallbackDriver;

2
src/nwfilter/nwfilter_driver.c
View File

@ -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;
}