External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-14 08:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkStartNetworkVirtual: Dissolve 'err0' label in 'error'

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2019-04-24 09:30:32 +02:00
parent 711f8e0866
commit 43808f3e90
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/bridge_driver.c
View File

@ -2370,7 +2370,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
*/ */
macTapIfName = networkBridgeDummyNicName(def->bridge); macTapIfName = networkBridgeDummyNicName(def->bridge);
if (!macTapIfName) if (!macTapIfName)
goto err0; goto error;
/* Keep tun fd open and interface up to allow for IPv6 DAD to happen */ /* Keep tun fd open and interface up to allow for IPv6 DAD to happen */
if (virNetDevTapCreateInBridgePort(def->bridge, if (virNetDevTapCreateInBridgePort(def->bridge,
&macTapIfName, &def->mac, &macTapIfName, &def->mac,
@ -2380,7 +2380,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_IFUP |
VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { VIR_NETDEV_TAP_CREATE_PERSIST) < 0) {
VIR_FREE(macTapIfName); VIR_FREE(macTapIfName);
goto err0; goto error;
} }
} }
@ -2526,9 +2526,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
virNetworkObjUnrefMacMap(obj); virNetworkObjUnrefMacMap(obj);
VIR_FREE(macMapFile); VIR_FREE(macMapFile);
err0:
if (!save_err)
virErrorPreserveLast(&save_err);
ignore_value(virNetDevBridgeDelete(def->bridge)); ignore_value(virNetDevBridgeDelete(def->bridge));
virErrorRestore(&save_err); virErrorRestore(&save_err);