External/libvirt
1
0
Fork 0
Code

Allow NULL mac address in virGetInterface

Browse Source 
There are places where an interface will not have a mac address, and netcf
returns this as a NULL pointer rather than a pointer to an empty string.
Rather than checking for this all over the place in libvirt, just save it
in the virInterface object as an empty string.

* src/datatypes.c: allow NULL mac in virGetInterface()
This commit is contained in:
Laine Stump 2009-11-03 16:42:53 +01:00 committed by Daniel Veillard
parent 112ed8f50d
commit 4728bad403
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/datatypes.c
View File

@ -588,10 +588,15 @@ virInterfacePtr
virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virGetInterface(virConnectPtr conn, const char *name, const char *mac) {
virInterfacePtr ret = NULL; virInterfacePtr ret = NULL;
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (mac == NULL)) { if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) {
virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__);
return(NULL); return(NULL);
} }
/* a NULL mac from caller is okay. Treat it as blank */
if (mac == NULL)
mac = "";
virMutexLock(&conn->lock); virMutexLock(&conn->lock);
ret = (virInterfacePtr) virHashLookup(conn->interfaces, name); ret = (virInterfacePtr) virHashLookup(conn->interfaces, name);