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

interface: Rename some virInterfaceObj* API's

Browse Source 
Prefix should have been virInterfaceObjList since the API is operating
on the list of interfaces.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-14 16:49:48 -04:00
parent 5374a1ca80
commit e2f3e6c38e
4 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/virinterfaceobj.c
View File

@ -107,9 +107,10 @@ virInterfaceObjListNew(void)
int int
virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces, virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
const char *mac, const char *mac,
virInterfaceObjPtr *matches, int maxmatches) virInterfaceObjPtr *matches,
int maxmatches)
{ {
size_t i; size_t i;
unsigned int matchct = 0; unsigned int matchct = 0;
@ -137,8 +138,8 @@ virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces,
virInterfaceObjPtr virInterfaceObjPtr
virInterfaceObjFindByName(virInterfaceObjListPtr interfaces, virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces,
const char *name) const char *name)
{ {
size_t i; size_t i;
@ -198,9 +199,9 @@ virInterfaceObjListClone(virInterfaceObjListPtr interfaces)
} }
VIR_FREE(xml); VIR_FREE(xml);
if (!(obj = virInterfaceObjAssignDef(dest, backup))) if (!(obj = virInterfaceObjListAssignDef(dest, backup)))
goto error; goto error;
virInterfaceObjUnlock(obj); /* locked by virInterfaceObjAssignDef */ virInterfaceObjUnlock(obj); /* locked by virInterfaceObjListAssignDef */
} }
return dest; return dest;
@ -212,12 +213,12 @@ virInterfaceObjListClone(virInterfaceObjListPtr interfaces)
virInterfaceObjPtr virInterfaceObjPtr
virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces, virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces,
virInterfaceDefPtr def) virInterfaceDefPtr def)
{ {
virInterfaceObjPtr obj; virInterfaceObjPtr obj;
if ((obj = virInterfaceObjFindByName(interfaces, def->name))) { if ((obj = virInterfaceObjListFindByName(interfaces, def->name))) {
virInterfaceDefFree(obj->def); virInterfaceDefFree(obj->def);
obj->def = def; obj->def = def;
@ -247,8 +248,8 @@ virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces,
void void
virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjListRemove(virInterfaceObjListPtr interfaces,
virInterfaceObjPtr obj) virInterfaceObjPtr obj)
{ {
size_t i; size_t i;
@ -268,8 +269,8 @@ virInterfaceObjRemove(virInterfaceObjListPtr interfaces,
int int
virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, virInterfaceObjListNumOfInterfaces(virInterfaceObjListPtr interfaces,
bool wantActive) bool wantActive)
{ {
size_t i; size_t i;
int ninterfaces = 0; int ninterfaces = 0;
@ -287,10 +288,10 @@ virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces,
int int
virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces,
bool wantActive, bool wantActive,
char **const names, char **const names,
int maxnames) int maxnames)
{ {
int nnames = 0; int nnames = 0;
size_t i; size_t i;

31
src/conf/virinterfaceobj.h
View File

@ -42,13 +42,14 @@ virInterfaceObjListPtr
virInterfaceObjListNew(void); virInterfaceObjListNew(void);
int int
virInterfaceObjFindByMACString(virInterfaceObjListPtr interfaces, virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
const char *mac, const char *mac,
virInterfaceObjPtr *matches, int maxmatches); virInterfaceObjPtr *matches,
int maxmatches);
virInterfaceObjPtr virInterfaceObjPtr
virInterfaceObjFindByName(virInterfaceObjListPtr interfaces, virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces,
const char *name); const char *name);
void void
virInterfaceObjFree(virInterfaceObjPtr obj); virInterfaceObjFree(virInterfaceObjPtr obj);
@ -60,12 +61,12 @@ virInterfaceObjListPtr
virInterfaceObjListClone(virInterfaceObjListPtr interfaces); virInterfaceObjListClone(virInterfaceObjListPtr interfaces);
virInterfaceObjPtr virInterfaceObjPtr
virInterfaceObjAssignDef(virInterfaceObjListPtr interfaces, virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces,
virInterfaceDefPtr def); virInterfaceDefPtr def);
void void
virInterfaceObjRemove(virInterfaceObjListPtr interfaces, virInterfaceObjListRemove(virInterfaceObjListPtr interfaces,
virInterfaceObjPtr obj); virInterfaceObjPtr obj);
void void
virInterfaceObjLock(virInterfaceObjPtr obj); virInterfaceObjLock(virInterfaceObjPtr obj);
@ -78,13 +79,13 @@ typedef bool
virInterfaceDefPtr def); virInterfaceDefPtr def);
int int
virInterfaceObjNumOfInterfaces(virInterfaceObjListPtr interfaces, virInterfaceObjListNumOfInterfaces(virInterfaceObjListPtr interfaces,
bool wantActive); bool wantActive);
int int
virInterfaceObjGetNames(virInterfaceObjListPtr interfaces, virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces,
bool wantActive, bool wantActive,
char **const names, char **const names,
int maxnames); int maxnames);
#endif /* __VIRINTERFACEOBJ_H__ */ #endif /* __VIRINTERFACEOBJ_H__ */

12
src/libvirt_private.syms
View File

@ -910,18 +910,18 @@ virDomainObjListRename;
# conf/virinterfaceobj.h # conf/virinterfaceobj.h
virInterfaceObjAssignDef;
virInterfaceObjFindByMACString;
virInterfaceObjFindByName;
virInterfaceObjGetDef; virInterfaceObjGetDef;
virInterfaceObjGetNames;
virInterfaceObjIsActive; virInterfaceObjIsActive;
virInterfaceObjListAssignDef;
virInterfaceObjListClone; virInterfaceObjListClone;
virInterfaceObjListFindByMACString;
virInterfaceObjListFindByName;
virInterfaceObjListFree; virInterfaceObjListFree;
virInterfaceObjListGetNames;
virInterfaceObjListNew; virInterfaceObjListNew;
virInterfaceObjListNumOfInterfaces;
virInterfaceObjListRemove;
virInterfaceObjLock; virInterfaceObjLock;
virInterfaceObjNumOfInterfaces;
virInterfaceObjRemove;
virInterfaceObjSetActive; virInterfaceObjSetActive;
virInterfaceObjUnlock; virInterfaceObjUnlock;

20
src/test/test_driver.c
View File

@ -1021,7 +1021,7 @@ testParseInterfaces(testDriverPtr privconn,
if (!def) if (!def)
goto error; goto error;
if (!(obj = virInterfaceObjAssignDef(privconn->ifaces, def))) { if (!(obj = virInterfaceObjListAssignDef(privconn->ifaces, def))) {
virInterfaceDefFree(def); virInterfaceDefFree(def);
goto error; goto error;
} }
@ -3631,7 +3631,7 @@ testInterfaceObjFindByName(testDriverPtr privconn,
virInterfaceObjPtr obj; virInterfaceObjPtr obj;
testDriverLock(privconn); testDriverLock(privconn);
obj = virInterfaceObjFindByName(privconn->ifaces, name); obj = virInterfaceObjListFindByName(privconn->ifaces, name);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (!obj) if (!obj)
@ -3650,7 +3650,7 @@ testConnectNumOfInterfaces(virConnectPtr conn)
int ninterfaces; int ninterfaces;
testDriverLock(privconn); testDriverLock(privconn);
ninterfaces = virInterfaceObjNumOfInterfaces(privconn->ifaces, true); ninterfaces = virInterfaceObjListNumOfInterfaces(privconn->ifaces, true);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return ninterfaces; return ninterfaces;
} }
@ -3665,7 +3665,8 @@ testConnectListInterfaces(virConnectPtr conn,
int nnames; int nnames;
testDriverLock(privconn); testDriverLock(privconn);
nnames = virInterfaceObjGetNames(privconn->ifaces, true, names, maxnames); nnames = virInterfaceObjListGetNames(privconn->ifaces, true,
names, maxnames);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return nnames; return nnames;
@ -3679,7 +3680,7 @@ testConnectNumOfDefinedInterfaces(virConnectPtr conn)
int ninterfaces; int ninterfaces;
testDriverLock(privconn); testDriverLock(privconn);
ninterfaces = virInterfaceObjNumOfInterfaces(privconn->ifaces, false); ninterfaces = virInterfaceObjListNumOfInterfaces(privconn->ifaces, false);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return ninterfaces; return ninterfaces;
} }
@ -3694,7 +3695,8 @@ testConnectListDefinedInterfaces(virConnectPtr conn,
int nnames; int nnames;
testDriverLock(privconn); testDriverLock(privconn);
nnames = virInterfaceObjGetNames(privconn->ifaces, false, names, maxnames); nnames = virInterfaceObjListGetNames(privconn->ifaces, false,
names, maxnames);
testDriverUnlock(privconn); testDriverUnlock(privconn);
return nnames; return nnames;
@ -3732,7 +3734,7 @@ testInterfaceLookupByMACString(virConnectPtr conn,
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
testDriverLock(privconn); testDriverLock(privconn);
ifacect = virInterfaceObjFindByMACString(privconn->ifaces, mac, &obj, 1); ifacect = virInterfaceObjListFindByMACString(privconn->ifaces, mac, &obj, 1);
testDriverUnlock(privconn); testDriverUnlock(privconn);
if (ifacect == 0) { if (ifacect == 0) {
@ -3901,7 +3903,7 @@ testInterfaceDefineXML(virConnectPtr conn,
if ((def = virInterfaceDefParseString(xmlStr)) == NULL) if ((def = virInterfaceDefParseString(xmlStr)) == NULL)
goto cleanup; goto cleanup;
if ((obj = virInterfaceObjAssignDef(privconn->ifaces, def)) == NULL) if ((obj = virInterfaceObjListAssignDef(privconn->ifaces, def)) == NULL)
goto cleanup; goto cleanup;
def = NULL; def = NULL;
objdef = virInterfaceObjGetDef(obj); objdef = virInterfaceObjGetDef(obj);
@ -3926,7 +3928,7 @@ testInterfaceUndefine(virInterfacePtr iface)
if (!(obj = testInterfaceObjFindByName(privconn, iface->name))) if (!(obj = testInterfaceObjFindByName(privconn, iface->name)))
return -1; return -1;
virInterfaceObjRemove(privconn->ifaces, obj); virInterfaceObjListRemove(privconn->ifaces, obj);
return 0; return 0;
} }