External/libvirt
1
0
Fork 0
Code

virnetworkobj: Drop needless cleanup label in virNetworkObjAddPort

Browse Source 
The cleanup label in virNetworkObjAddPort() function serves no
purpose. Drop it and thus simplify the function a bit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2019-07-09 16:51:43 +02:00
parent 37d8d6b98d
commit 6246400329
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/virnetworkobj.c
View File

@ -1625,7 +1625,6 @@ virNetworkObjAddPort(virNetworkObjPtr net,
virNetworkPortDefPtr portdef,
const char *stateDir)
{
int ret = -1;
char uuidstr[VIR_UUID_STRING_BUFLEN];
VIR_AUTOFREE(char *) dir = NULL;
@ -1635,24 +1634,21 @@ virNetworkObjAddPort(virNetworkObjPtr net,
virReportError(VIR_ERR_NETWORK_PORT_EXIST,
_("Network port with UUID %s already exists"),
uuidstr);
goto cleanup;
return -1;
}
if (!(dir = virNetworkObjGetPortStatusDir(net, stateDir)))
goto cleanup;
return -1;
if (virHashAddEntry(net->ports, uuidstr, portdef) < 0)
goto cleanup;
return -1;
if (virNetworkPortDefSaveStatus(portdef, dir) < 0) {
virHashRemoveEntry(net->ports, uuidstr);
goto cleanup;
return -1;
}
ret = 0;
cleanup:
return ret;
return 0;
}