External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: Rename virNetworkObjAssignDef to virNetworkObjUpdateAssignDef

Browse Source 
Rename the API to be a better description of what it does. Besides, a
subsequent patch will rename virNetworkAssignDef to virNetworkObjAssignDef
so rather than make that patch confusing we'll take the intermittent step
in this patch.
This commit is contained in:
John Ferlan 2017-03-08 11:19:20 -05:00
parent 609dac1b8f
commit 4726020bc0
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/virnetworkobj.c
View File

@ -276,7 +276,7 @@ virNetworkObjListDispose(void *obj)
/* /*
* virNetworkObjAssignDef: * virNetworkObjUpdateAssignDef:
* @network: the network object to update * @network: the network object to update
* @def: the new NetworkDef (will be consumed by this function) * @def: the new NetworkDef (will be consumed by this function)
* @live: is this new def the "live" version, or the "persistent" version * @live: is this new def the "live" version, or the "persistent" version
@ -292,9 +292,9 @@ virNetworkObjListDispose(void *obj)
* *
*/ */
void void
virNetworkObjAssignDef(virNetworkObjPtr network, virNetworkObjUpdateAssignDef(virNetworkObjPtr network,
virNetworkDefPtr def, virNetworkDefPtr def,
bool live) bool live)
{ {
if (live) { if (live) {
/* before setting new live def, save (into newDef) any /* before setting new live def, save (into newDef) any
@ -378,9 +378,9 @@ virNetworkAssignDefLocked(virNetworkObjListPtr nets,
} }
} }
virNetworkObjAssignDef(network, virNetworkObjUpdateAssignDef(network,
def, def,
!!(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE)); !!(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE));
} else { } else {
/* UUID does not match, but if a name matches, refuse it */ /* UUID does not match, but if a name matches, refuse it */
if ((network = virNetworkObjFindByNameLocked(nets, def->name))) { if ((network = virNetworkObjFindByNameLocked(nets, def->name))) {

6
src/conf/virnetworkobj.h
View File

@ -95,9 +95,9 @@ virNetworkAssignDef(virNetworkObjListPtr nets,
unsigned int flags); unsigned int flags);
void void
virNetworkObjAssignDef(virNetworkObjPtr network, virNetworkObjUpdateAssignDef(virNetworkObjPtr network,
virNetworkDefPtr def, virNetworkDefPtr def,
bool live); bool live);
int int
virNetworkObjSetDefTransient(virNetworkObjPtr network, virNetworkObjSetDefTransient(virNetworkObjPtr network,

2
src/libvirt_private.syms
View File

@ -925,7 +925,6 @@ virNetworkConfigChangeSetup;
virNetworkDeleteConfig; virNetworkDeleteConfig;
virNetworkLoadAllConfigs; virNetworkLoadAllConfigs;
virNetworkLoadAllState; virNetworkLoadAllState;
virNetworkObjAssignDef;
virNetworkObjEndAPI; virNetworkObjEndAPI;
virNetworkObjFindByName; virNetworkObjFindByName;
virNetworkObjFindByNameLocked; virNetworkObjFindByNameLocked;
@ -944,6 +943,7 @@ virNetworkObjSetDefTransient;
virNetworkObjTaint; virNetworkObjTaint;
virNetworkObjUnsetDefTransient; virNetworkObjUnsetDefTransient;
virNetworkObjUpdate; virNetworkObjUpdate;
virNetworkObjUpdateAssignDef;
virNetworkRemoveInactive; virNetworkRemoveInactive;
virNetworkSaveStatus; virNetworkSaveStatus;

4
src/network/bridge_driver.c
View File

@ -3490,7 +3490,7 @@ static virNetworkPtr networkDefineXML(virConnectPtr conn, const char *xml)
* definition by making it transient. * definition by making it transient.
* XXX - this isn't necessarily the correct thing to do. * XXX - this isn't necessarily the correct thing to do.
*/ */
virNetworkObjAssignDef(network, NULL, false); virNetworkObjUpdateAssignDef(network, NULL, false);
goto cleanup; goto cleanup;
} }
@ -3554,7 +3554,7 @@ networkUndefine(virNetworkPtr net)
/* if the network still exists, it was active, and we need to make /* if the network still exists, it was active, and we need to make
* it transient (by deleting the persistent def) * it transient (by deleting the persistent def)
*/ */
virNetworkObjAssignDef(network, NULL, false); virNetworkObjUpdateAssignDef(network, NULL, false);
} }
ret = 0; ret = 0;