External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_driver: Use more of networkObjFromNetwork

Browse Source 
Now that the network driver lock is ash heap of history,
we can use more of networkObjFromNetwork().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-03-02 12:22:11 +01:00
parent baf8cf9c80
commit eb7b635582
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/network/bridge_driver.c
View File

@ -168,7 +168,6 @@ networkObjFromNetwork(virNetworkPtr net)
char uuidstr[VIR_UUID_STRING_BUFLEN];
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virUUIDFormat(net->uuid, uuidstr);
virReportError(VIR_ERR_NO_NETWORK,
@ -3079,12 +3078,8 @@ networkUndefine(virNetworkPtr net)
bool active = false;
virObjectEventPtr event = NULL;
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid"));
if (!(network = networkObjFromNetwork(net)))
goto cleanup;
}
if (virNetworkUndefineEnsureACL(net->conn, network->def) < 0)
goto cleanup;
@ -3145,12 +3140,8 @@ networkUpdate(virNetworkPtr net,
VIR_NETWORK_UPDATE_AFFECT_CONFIG,
-1);
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid"));
if (!(network = networkObjFromNetwork(net)))
goto cleanup;
}
if (virNetworkUpdateEnsureACL(net->conn, network->def, flags) < 0)
goto cleanup;
@ -3300,13 +3291,8 @@ static int networkCreate(virNetworkPtr net)
int ret = -1;
virObjectEventPtr event = NULL;
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid"));
if (!(network = networkObjFromNetwork(net)))
goto cleanup;
}
if (virNetworkCreateEnsureACL(net->conn, network->def) < 0)
goto cleanup;
@ -3333,13 +3319,8 @@ static int networkDestroy(virNetworkPtr net)
int ret = -1;
virObjectEventPtr event = NULL;
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid"));
if (!(network = networkObjFromNetwork(net)))
goto cleanup;
}
if (virNetworkDestroyEnsureACL(net->conn, network->def) < 0)
goto cleanup;
@ -3451,13 +3432,9 @@ static int networkSetAutostart(virNetworkPtr net,
char *configFile = NULL, *autostartLink = NULL;
int ret = -1;
network = virNetworkObjFindByUUID(driver->networks, net->uuid);
if (!network) {
virReportError(VIR_ERR_NO_NETWORK,
"%s", _("no network with matching uuid"));
if (!(network = networkObjFromNetwork(net)))
goto cleanup;
}
if (virNetworkSetAutostartEnsureACL(net->conn, network->def) < 0)
goto cleanup;