]> xenbits.xensource.com Git - libvirt.git/commitdiff
networkStartNetworkVirtual: Dissolve 'err0' label in 'error'
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 24 Apr 2019 07:30:32 +0000 (09:30 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 21 May 2019 11:53:31 +0000 (13:53 +0200)
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/network/bridge_driver.c

index 59c9780a7e83cae7a47695e363f056a4a9a44dc4..0e9bb78c32a4a2ae1b7bee61a191eeecf32a7a5a 100644 (file)
@@ -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);