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

network: Move and rename networkMacMgrFileName

Browse Source 
Move networkMacMgrFileName into src/util/virmacmap.c and rename to
virMacMapFileName. We're about to move some more MacMgr processing
files into virnetworkobj and it doesn't make sense to have this helper
in the driver or in virnetworkobj.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-07-26 06:59:19 -04:00
parent 8e51b30148
commit 070b6f7f55
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -2070,6 +2070,7 @@ virMacAddrSetRaw;
# util/virmacmap.h
virMacMapAdd;
virMacMapDumpStr;
virMacMapFileName;
virMacMapLookup;
virMacMapNew;
virMacMapRemove;

24
src/network/bridge_driver.c
View File

@ -322,18 +322,6 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr driver,
}
static char *
networkMacMgrFileName(virNetworkDriverStatePtr driver,
const char *bridge)
{
char *filename;
ignore_value(virAsprintf(&filename, "%s/%s.macs",
driver->dnsmasqStateDir, bridge));
return filename;
}
/* do needed cleanup steps and remove the network from the list */
static int
networkRemoveInactive(virNetworkDriverStatePtr driver,
@ -375,7 +363,7 @@ networkRemoveInactive(virNetworkDriverStatePtr driver,
if (!(statusfile = virNetworkConfigFile(driver->stateDir, def->name)))
goto cleanup;
if (!(macMapFile = networkMacMgrFileName(driver, def->bridge)))
if (!(macMapFile = virMacMapFileName(driver->dnsmasqStateDir, def->bridge)))
goto cleanup;
/* dnsmasq */
@ -427,7 +415,7 @@ networkMacMgrAdd(virNetworkDriverStatePtr driver,
virMacAddrFormat(mac, macStr);
if (!(file = networkMacMgrFileName(driver, obj->def->bridge)))
if (!(file = virMacMapFileName(driver->dnsmasqStateDir, obj->def->bridge)))
goto cleanup;
if (virMacMapAdd(obj->macmap, domain, macStr) < 0)
@ -458,7 +446,7 @@ networkMacMgrDel(virNetworkDriverStatePtr driver,
virMacAddrFormat(mac, macStr);
if (!(file = networkMacMgrFileName(driver, obj->def->bridge)))
if (!(file = virMacMapFileName(driver->dnsmasqStateDir, obj->def->bridge)))
goto cleanup;
if (virMacMapRemove(obj->macmap, domain, macStr) < 0)
@ -523,7 +511,8 @@ networkUpdateState(virNetworkObjPtr obj,
if (!(obj->def->bridge && virNetDevExists(obj->def->bridge) == 1))
obj->active = 0;
if (!(macMapFile = networkMacMgrFileName(driver, obj->def->bridge)))
if (!(macMapFile = virMacMapFileName(driver->dnsmasqStateDir,
obj->def->bridge)))
goto cleanup;
if (!(obj->macmap = virMacMapNew(macMapFile)))
@ -2380,7 +2369,8 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
}
}
if (!(macMapFile = networkMacMgrFileName(driver, obj->def->bridge)) ||
if (!(macMapFile = virMacMapFileName(driver->dnsmasqStateDir,
obj->def->bridge)) ||
!(obj->macmap = virMacMapNew(macMapFile)))
goto err1;

12
src/util/virmacmap.c
View File

@ -294,6 +294,18 @@ virMacMapWriteFileLocked(virMacMapPtr mgr,
}
char *
virMacMapFileName(const char *dnsmasqStateDir,
const char *bridge)
{
char *filename;
ignore_value(virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge));
return filename;
}
#define VIR_MAC_HASH_TABLE_SIZE 10
virMacMapPtr

4
src/util/virmacmap.h
View File

@ -27,6 +27,10 @@
typedef struct virMacMap virMacMap;
typedef virMacMap *virMacMapPtr;
char *
virMacMapFileName(const char *dnsmasqStateDir,
const char *bridge);
virMacMapPtr virMacMapNew(const char *file);
int virMacMapAdd(virMacMapPtr mgr,