shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

interface: Clean up virInterfaceObjListFindByMACString

Browse Source 
Alter the algorithm to return a list of matching names rather than a
list of match virInterfaceObjPtr which are then just dereferenced
extracting the def->name and def->mac. Since the def->mac would be
the same as the passed @mac, just return a list of names and as long
as there's only one, extract the [0] entry from the passed list.
Also alter the error message on failure to include the mac that wasn't
found.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-15 07:08:01 -04:00
parent e2f3e6c38e
commit 9c9a12ca31
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conf/virinterfaceobj.c
View File

@ -109,11 +109,11 @@ virInterfaceObjListNew(void)
int
virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
const char *mac,
virInterfaceObjPtr *matches,
char **const matches,
int maxmatches)
{
size_t i;
unsigned int matchct = 0;
int matchct = 0;
for (i = 0; i < interfaces->count; i++) {
virInterfaceObjPtr obj = interfaces->objs[i];
@ -122,18 +122,23 @@ virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
virInterfaceObjLock(obj);
def = obj->def;
if (STRCASEEQ(def->mac, mac)) {
matchct++;
if (matchct <= maxmatches) {
matches[matchct - 1] = obj;
/* keep the lock if we're returning object to caller */
/* it is the caller's responsibility to unlock *all* matches */
continue;
if (matchct < maxmatches) {
if (VIR_STRDUP(matches[matchct], def->name) < 0) {
virInterfaceObjUnlock(obj);
goto error;
}
matchct++;
}
}
virInterfaceObjUnlock(obj);
}
return matchct;
error:
while (--matchct >= 0)
VIR_FREE(matches[matchct]);
return -1;
}

2
src/conf/virinterfaceobj.h
View File

@ -44,7 +44,7 @@ virInterfaceObjListNew(void);
int
virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces,
const char *mac,
virInterfaceObjPtr *matches,
char **const matches,
int maxmatches);
virInterfaceObjPtr

16
src/test/test_driver.c
View File

@ -3728,17 +3728,18 @@ testInterfaceLookupByMACString(virConnectPtr conn,
const char *mac)
{
testDriverPtr privconn = conn->privateData;
virInterfaceObjPtr obj;
virInterfaceDefPtr def;
int ifacect;
char *ifacenames[] = { NULL, NULL };
virInterfacePtr ret = NULL;
testDriverLock(privconn);
ifacect = virInterfaceObjListFindByMACString(privconn->ifaces, mac, &obj, 1);
ifacect = virInterfaceObjListFindByMACString(privconn->ifaces, mac,
ifacenames, 2);
testDriverUnlock(privconn);
if (ifacect == 0) {
virReportError(VIR_ERR_NO_INTERFACE, NULL);
virReportError(VIR_ERR_NO_INTERFACE,
_("no interface with matching mac '%s'"), mac);
goto cleanup;
}
@ -3747,12 +3748,11 @@ testInterfaceLookupByMACString(virConnectPtr conn,
goto cleanup;
}
def = virInterfaceObjGetDef(obj);
ret = virGetInterface(conn, def->name, def->mac);
ret = virGetInterface(conn, ifacenames[0], mac);
cleanup:
if (obj)
virInterfaceObjUnlock(obj);
VIR_FREE(ifacenames[0]);
VIR_FREE(ifacenames[1]);
return ret;
}