External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Push configFile building into LoadConfig

Browse Source 
This matches the pattern used for network object APIs, and we want
configDir in LoadConfig for upcoming patches
This commit is contained in:
Cole Robinson 2016-04-24 18:56:06 -04:00
parent ab05abdbc3
commit 0feb1c6c24
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/conf/nwfilter_conf.c
View File

@ -3156,30 +3156,38 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
static virNWFilterObjPtr
virNWFilterObjLoad(virNWFilterObjListPtr nwfilters,
const char *file,
const char *path)
virNWFilterLoadConfig(virNWFilterObjListPtr nwfilters,
const char *configDir,
const char *name)
{
virNWFilterDefPtr def;
virNWFilterDefPtr def = NULL;
virNWFilterObjPtr nwfilter;
char *configFile = NULL;
if (!(def = virNWFilterDefParseFile(path)))
return NULL;
if (!(configFile = virFileBuildPath(configDir, name, ".xml")))
goto error;
if (!virFileMatchesNameSuffix(file, def->name, ".xml")) {
if (!(def = virNWFilterDefParseFile(configFile)))
goto error;
if (STRNEQ(name, def->name)) {
virReportError(VIR_ERR_XML_ERROR,
_("network filter config filename '%s' does not match name '%s'"),
path, def->name);
virNWFilterDefFree(def);
return NULL;
_("network filter config filename '%s' "
"does not match name '%s'"),
configFile, def->name);
goto error;
}
if (!(nwfilter = virNWFilterObjAssignDef(nwfilters, def))) {
virNWFilterDefFree(def);
return NULL;
}
if (!(nwfilter = virNWFilterObjAssignDef(nwfilters, def)))
goto error;
VIR_FREE(configFile);
return nwfilter;
error:
VIR_FREE(configFile);
virNWFilterDefFree(def);
return NULL;
}
@ -3200,23 +3208,17 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
}
while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
char *path;
virNWFilterObjPtr nwfilter;
if (entry->d_name[0] == '.')
continue;
if (!virFileHasSuffix(entry->d_name, ".xml"))
if (!virFileStripSuffix(entry->d_name, ".xml"))
continue;
if (!(path = virFileBuildPath(configDir, entry->d_name, NULL)))
continue;
nwfilter = virNWFilterObjLoad(nwfilters, entry->d_name, path);
nwfilter = virNWFilterLoadConfig(nwfilters, configDir, entry->d_name);
if (nwfilter)
virNWFilterObjUnlock(nwfilter);
VIR_FREE(path);
}
closedir(dir);