NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

networkStartNetworkVirtual: Dissolve 'err1' 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:26:15 +02:00
parent 90ab480cab
commit 711f8e0866
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/network/bridge_driver.c
View File

@ -2387,7 +2387,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
if (!(macMapFile = virMacMapFileName(driver->dnsmasqStateDir, if (!(macMapFile = virMacMapFileName(driver->dnsmasqStateDir,
def->bridge)) || def->bridge)) ||
!(macmap = virMacMapNew(macMapFile))) !(macmap = virMacMapNew(macMapFile)))
goto err1; goto error;
virNetworkObjSetMacMap(obj, macmap); virNetworkObjSetMacMap(obj, macmap);
macmap = NULL; macmap = NULL;
@ -2398,21 +2398,21 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
* expects milliseconds * expects milliseconds
*/ */
if (virNetDevBridgeSetSTPDelay(def->bridge, def->delay * 1000) < 0) if (virNetDevBridgeSetSTPDelay(def->bridge, def->delay * 1000) < 0)
goto err1; goto error;
if (virNetDevBridgeSetSTP(def->bridge, def->stp ? true : false) < 0) if (virNetDevBridgeSetSTP(def->bridge, def->stp ? true : false) < 0)
goto err1; goto error;
/* Disable IPv6 on the bridge if there are no IPv6 addresses /* Disable IPv6 on the bridge if there are no IPv6 addresses
* defined, and set other IPv6 sysctl tunables appropriately. * defined, and set other IPv6 sysctl tunables appropriately.
*/ */
if (networkSetIPv6Sysctls(obj) < 0) if (networkSetIPv6Sysctls(obj) < 0)
goto err1; goto error;
/* Add "once per network" rules */ /* Add "once per network" rules */
if (def->forward.type != VIR_NETWORK_FORWARD_OPEN && if (def->forward.type != VIR_NETWORK_FORWARD_OPEN &&
networkAddFirewallRules(def) < 0) networkAddFirewallRules(def) < 0)
goto err1; goto error;
firewalRulesAdded = true; firewalRulesAdded = true;
@ -2518,10 +2518,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
def->forward.type != VIR_NETWORK_FORWARD_OPEN) def->forward.type != VIR_NETWORK_FORWARD_OPEN)
networkRemoveFirewallRules(def); networkRemoveFirewallRules(def);
err1:
if (!save_err)
virErrorPreserveLast(&save_err);
if (macTapIfName) { if (macTapIfName) {
VIR_FORCE_CLOSE(tapfd); VIR_FORCE_CLOSE(tapfd);
ignore_value(virNetDevTapDelete(macTapIfName, NULL)); ignore_value(virNetDevTapDelete(macTapIfName, NULL));