Now fd= and helper= cases are just a duplication of fds= case with queues=1. Let's merge them all.
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> --- net/tap.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/net/tap.c b/net/tap.c index b0b5e0b0fc..c6bea0dcab 100644 --- a/net/tap.c +++ b/net/tap.c @@ -904,19 +904,7 @@ int net_init_tap(const Netdev *netdev, const char *name, goto fail; } - if (tap->fd) { - vnet_hdr = tap_probe_vnet_hdr(fds[0], errp); - if (vnet_hdr < 0) { - goto fail; - } - - if (!net_init_tap_one(tap, peer, name, NULL, - NULL, NULL, - vhost_fds ? vhost_fds[0] : -1, - vnet_hdr, fds[0], errp)) { - goto fail; - } - } else if (tap->fds) { + if (fds) { for (i = 0; i < queues; i++) { if (i == 0) { vnet_hdr = tap_probe_vnet_hdr(fds[i], errp); @@ -936,18 +924,6 @@ int net_init_tap(const Netdev *netdev, const char *name, goto fail; } } - } else if (tap->helper) { - vnet_hdr = tap_probe_vnet_hdr(fds[0], errp); - if (vnet_hdr < 0) { - goto fail; - } - - if (!net_init_tap_one(tap, peer, name, ifname, - NULL, NULL, - vhost_fds ? vhost_fds[0] : -1, - vnet_hdr, fds[0], errp)) { - goto fail; - } } else { g_autofree char *script = tap_parse_script(tap->script, DEFAULT_NETWORK_SCRIPT); -- 2.52.0
