net/tap: net_init_tap_one(): drop model parameter
It could be simply derived from tap parameter. And this change simplifies further refactoring. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Ben Chaney <bchaney@akamai.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
Vladimir Sementsov-Ogievskiy committed
Mar 18, 2026 at 14:31 UTC
c1a82a940d571bff29cb300fa49b05b035fcc300
1 file changed
+7
-6
net/tap.c
+7
-6
@@ -704,12 +704,13 @@ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr,
704
#define MAX_TAP_QUEUES 1024
705
706
static bool net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
707
- const char *model, const char *name,
707
+ const char *name,
708
const char *ifname, const char *script,
709
const char *downscript, int vhostfd,
710
int vnet_hdr, int fd, Error **errp)
711
{
712
- TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
712
+ TAPState *s = net_tap_fd_init(peer, tap->helper ? "bridge" : "tap",
713
+ name, fd, vnet_hdr);
714
bool sndbuf_required = tap->has_sndbuf;
715
int sndbuf =
716
(tap->has_sndbuf && tap->sndbuf) ? MIN(tap->sndbuf, INT_MAX) : INT_MAX;
@@ -883,7 +884,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
884
goto fail;
885
}
886
886
- if (!net_init_tap_one(tap, peer, "tap", name, NULL,
887
+ if (!net_init_tap_one(tap, peer, name, NULL,
888
NULL, NULL,
889
vhostfd, vnet_hdr, fd, errp)) {
890
goto fail;
@@ -934,7 +935,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
935
goto fail;
936
}
937
937
- if (!net_init_tap_one(tap, peer, "tap", name, ifname,
938
+ if (!net_init_tap_one(tap, peer, name, ifname,
939
NULL, NULL,
940
vhostfd,
941
vnet_hdr, fd, errp)) {
@@ -957,7 +958,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
958
goto fail;
959
}
960
960
- if (!net_init_tap_one(tap, peer, "bridge", name, ifname,
961
+ if (!net_init_tap_one(tap, peer, name, ifname,
962
NULL, NULL, vhostfd,
963
vnet_hdr, fd, errp)) {
964
goto fail;
@@ -988,7 +989,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
989
}
990
}
991
991
- if (!net_init_tap_one(tap, peer, "tap", name, ifname,
992
+ if (!net_init_tap_one(tap, peer, name, ifname,
993
i >= 1 ? NULL : script,
994
i >= 1 ? NULL : downscript,
995
vhostfd, vnet_hdr, fd, errp)) {