[libvirt] [PATCH 6/6] networkStartNetworkVirtual: Dissolve 'err0' label in 'error'
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/network/bridge_driver.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 59c9780a7e..0e9bb78c32 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2370,7 +2370,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
*/
macTapIfName = networkBridgeDummyNicName(def->bridge);
if (!macTapIfName)
- goto err0;
+ goto error;
/* Keep tun fd open and interface up to allow for IPv6 DAD to happen */
if (virNetDevTapCreateInBridgePort(def->bridge,
&macTapIfName, &def->mac,
@@ -2380,7 +2380,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
VIR_NETDEV_TAP_CREATE_IFUP |
VIR_NETDEV_TAP_CREATE_PERSIST) < 0) {
VIR_FREE(macTapIfName);
- goto err0;
+ goto error;
}
}
@@ -2526,9 +2526,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
virNetworkObjUnrefMacMap(obj);
VIR_FREE(macMapFile);
- err0:
- if (!save_err)
- virErrorPreserveLast(&save_err);
ignore_value(virNetDevBridgeDelete(def->bridge));
virErrorRestore(&save_err);
--
2.21.0