External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: Introduce virNetworkObjGetClassIdMap

Browse Source 
In preparation for privatizing virNetworkObj, create accessor function to
fetch the @classIdMap.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-09 17:41:23 -04:00
parent d5d699ec18
commit 7435404fd5
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/virnetworkobj.c
View File

@ -137,6 +137,13 @@ virNetworkObjSetRadvdPid(virNetworkObjPtr obj,
} }
virBitmapPtr
virNetworkObjGetClassIdMap(virNetworkObjPtr obj)
{
return obj->classIdMap;
}
virMacMapPtr virMacMapPtr
virNetworkObjGetMacMap(virNetworkObjPtr obj) virNetworkObjGetMacMap(virNetworkObjPtr obj)
{ {

3
src/conf/virnetworkobj.h
View File

@ -67,6 +67,9 @@ void
virNetworkObjSetRadvdPid(virNetworkObjPtr obj, virNetworkObjSetRadvdPid(virNetworkObjPtr obj,
pid_t radvdPid); pid_t radvdPid);
virBitmapPtr
virNetworkObjGetClassIdMap(virNetworkObjPtr obj);
void void
virNetworkObjSetMacMap(virNetworkObjPtr obj, virNetworkObjSetMacMap(virNetworkObjPtr obj,
virMacMapPtr macmap); virMacMapPtr macmap);

1
src/libvirt_private.syms
View File

@ -942,6 +942,7 @@ virNetworkObjDeleteConfig;
virNetworkObjEndAPI; virNetworkObjEndAPI;
virNetworkObjFindByName; virNetworkObjFindByName;
virNetworkObjFindByUUID; virNetworkObjFindByUUID;
virNetworkObjGetClassIdMap;
virNetworkObjGetDnsmasqPid; virNetworkObjGetDnsmasqPid;
virNetworkObjGetMacMap; virNetworkObjGetMacMap;
virNetworkObjGetPersistentDef; virNetworkObjGetPersistentDef;

13
src/network/bridge_driver.c
View File

@ -5346,10 +5346,11 @@ static ssize_t
networkNextClassID(virNetworkObjPtr obj) networkNextClassID(virNetworkObjPtr obj)
{ {
ssize_t ret = 0; ssize_t ret = 0;
virBitmapPtr classIdMap = virNetworkObjGetClassIdMap(obj);
ret = virBitmapNextClearBit(obj->classIdMap, -1); ret = virBitmapNextClearBit(classIdMap, -1);
if (ret < 0 || virBitmapSetBit(obj->classIdMap, ret) < 0) if (ret < 0 || virBitmapSetBit(classIdMap, ret) < 0)
return -1; return -1;
return ret; return ret;
@ -5363,6 +5364,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj,
unsigned long long new_rate) unsigned long long new_rate)
{ {
virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkDriverStatePtr driver = networkGetDriver();
virBitmapPtr classIdMap = virNetworkObjGetClassIdMap(obj);
ssize_t class_id = 0; ssize_t class_id = 0;
int plug_ret; int plug_ret;
int ret = -1; int ret = -1;
@ -5387,7 +5389,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj,
obj->floor_sum += ifaceBand->in->floor; obj->floor_sum += ifaceBand->in->floor;
/* update status file */ /* update status file */
if (virNetworkObjSaveStatus(driver->stateDir, obj) < 0) { if (virNetworkObjSaveStatus(driver->stateDir, obj) < 0) {
ignore_value(virBitmapClearBit(obj->classIdMap, class_id)); ignore_value(virBitmapClearBit(classIdMap, class_id));
obj->floor_sum -= ifaceBand->in->floor; obj->floor_sum -= ifaceBand->in->floor;
iface->data.network.actual->class_id = 0; iface->data.network.actual->class_id = 0;
ignore_value(virNetDevBandwidthUnplug(obj->def->bridge, class_id)); ignore_value(virNetDevBandwidthUnplug(obj->def->bridge, class_id));
@ -5451,6 +5453,7 @@ static int
networkUnplugBandwidth(virNetworkObjPtr obj, networkUnplugBandwidth(virNetworkObjPtr obj,
virDomainNetDefPtr iface) virDomainNetDefPtr iface)
{ {
virBitmapPtr classIdMap = virNetworkObjGetClassIdMap(obj);
virNetworkDriverStatePtr driver = networkGetDriver(); virNetworkDriverStatePtr driver = networkGetDriver();
int ret = 0; int ret = 0;
unsigned long long new_rate; unsigned long long new_rate;
@ -5476,12 +5479,12 @@ networkUnplugBandwidth(virNetworkObjPtr obj,
/* update sum of 'floor'-s of attached NICs */ /* update sum of 'floor'-s of attached NICs */
obj->floor_sum -= ifaceBand->in->floor; obj->floor_sum -= ifaceBand->in->floor;
/* return class ID */ /* return class ID */
ignore_value(virBitmapClearBit(obj->classIdMap, ignore_value(virBitmapClearBit(classIdMap,
iface->data.network.actual->class_id)); iface->data.network.actual->class_id));
/* update status file */ /* update status file */
if (virNetworkObjSaveStatus(driver->stateDir, obj) < 0) { if (virNetworkObjSaveStatus(driver->stateDir, obj) < 0) {
obj->floor_sum += ifaceBand->in->floor; obj->floor_sum += ifaceBand->in->floor;
ignore_value(virBitmapSetBit(obj->classIdMap, ignore_value(virBitmapSetBit(classIdMap,
iface->data.network.actual->class_id)); iface->data.network.actual->class_id));
goto cleanup; goto cleanup;
} }