From: Steve Sistare <[email protected]> Modify net_init_tap so every return branches to a common label, for common cleanup in a subsequent patch. No functional change.
Signed-off-by: Steve Sistare <[email protected]> Signed-off-by: Ben Chaney <[email protected]> --- net/tap.c | 55 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/net/tap.c b/net/tap.c index abe3b2d036..9d480574c3 100644 --- a/net/tap.c +++ b/net/tap.c @@ -830,7 +830,8 @@ int net_init_tap(const Netdev *netdev, const char *name, * For -netdev, peer is always NULL. */ if (peer && (tap->has_queues || tap->fds || tap->vhostfds)) { error_setg(errp, "Multiqueue tap cannot be used with hubs"); - return -1; + ret = -1; + goto out; } if (tap->fd) { @@ -840,23 +841,27 @@ int net_init_tap(const Netdev *netdev, const char *name, error_setg(errp, "ifname=, script=, downscript=, vnet_hdr=, " "helper=, queues=, fds=, and vhostfds= " "are invalid with fd="); - return -1; + ret = -1; + goto out; } fd = monitor_fd_param(monitor_cur(), tap->fd, errp); if (fd == -1) { - return -1; + ret = -1; + goto out; } if (!qemu_set_blocking(fd, false, errp)) { close(fd); - return -1; + ret = -1; + goto out; } vnet_hdr = tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { close(fd); - return -1; + ret = -1; + goto out; } net_init_tap_one(tap, peer, "tap", name, NULL, @@ -865,7 +870,8 @@ int net_init_tap(const Netdev *netdev, const char *name, if (err) { error_propagate(errp, err); close(fd); - return -1; + ret = -1; + goto out; } } else if (tap->fds) { char **fds; @@ -878,7 +884,8 @@ int net_init_tap(const Netdev *netdev, const char *name, error_setg(errp, "ifname=, script=, downscript=, vnet_hdr=, " "helper=, queues=, and vhostfd= " "are invalid with fds="); - return -1; + ret = -1; + goto out; } fds = g_new0(char *, MAX_TAP_QUEUES); @@ -940,29 +947,35 @@ free_fail: } g_free(fds); g_free(vhost_fds); - return ret; + goto out; + } else if (tap->helper) { if (tap->ifname || tap->script || tap->downscript || tap->has_vnet_hdr || tap->has_queues || tap->vhostfds) { error_setg(errp, "ifname=, script=, downscript=, vnet_hdr=, " "queues=, and vhostfds= are invalid with helper="); - return -1; + ret = -1; + goto out; } fd = net_bridge_run_helper(tap->helper, tap->br ?: DEFAULT_BRIDGE_INTERFACE, errp); if (fd == -1) { - return -1; + ret = -1; + goto out; } if (!qemu_set_blocking(fd, false, errp)) { - return -1; + close(fd); + ret = -1; + goto out; } vnet_hdr = tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { close(fd); - return -1; + ret = -1; + goto out; } net_init_tap_one(tap, peer, "bridge", name, ifname, @@ -971,14 +984,16 @@ free_fail: if (err) { error_propagate(errp, err); close(fd); - return -1; + ret = -1; + goto out; } } else { g_autofree char *default_script = NULL; g_autofree char *default_downscript = NULL; if (tap->vhostfds) { error_setg(errp, "vhostfds= is invalid if fds= wasn't specified"); - return -1; + ret = -1; + goto out; } if (!script) { @@ -999,14 +1014,16 @@ free_fail: fd = net_tap_init(tap, &vnet_hdr, i >= 1 ? "no" : script, ifname, sizeof ifname, queues > 1, errp); if (fd == -1) { - return -1; + ret = -1; + goto out; } if (queues > 1 && i == 0 && !tap->ifname) { if (tap_fd_get_ifname(fd, ifname)) { error_setg(errp, "Fail to get ifname"); close(fd); - return -1; + ret = -1; + goto out; } } @@ -1017,12 +1034,14 @@ free_fail: if (err) { error_propagate(errp, err); close(fd); - return -1; + ret = -1; + goto out; } } } - return 0; +out: + return ret; } int tap_enable(NetClientState *nc) -- 2.34.1
