From nobody Sat Nov 15 07:45:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1755526125; cv=none; d=zohomail.com; s=zohoarc; b=c9zFERzTjz9pP/t1EOz4kiX+PEdwJJVMdsvJgbTjzsjUuDO2y/ZY2Hx1pxYYpWo3VdOiQqxCFD3pbJabgOoZ4dXKfqwmqWZR5vf+spXRJ+UuIJiDTsX7gJ646eZrRDKtTxxcapocCOHkN0jL62fvOirM5BMfocHh3FOO5gc6Tq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755526125; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3d3UPuB7M4BByxpoQwPGncY1dWDIJSAfRsgScbQZ1no=; b=IQu5kS2yr3aJNfS571UzXVoGUEJ0M+KhMkQOEU/nKQDJGS0gSYSlBg2gS/fUNCs/KU5tt8Z7GapHEwLakN+slNvDFogSqSi+UY5FQsImguvV3J6ZvoGLsdSQCT3uvqvbLol50m4Xu9uD6MdK0ZQ0L3POXLQ9VzFDmeO1FzJrRpo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755526125981284.6960471257653; Mon, 18 Aug 2025 07:08:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uo0Vu-0001fJ-HW; Mon, 18 Aug 2025 10:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uo0Vo-0001MN-UV for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:00 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uo0Vm-0002Cz-Ih for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:00 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c21:2d8b:0:640:7d49:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 13B13807D9; Mon, 18 Aug 2025 17:06:54 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b25::1:17]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id k6RC4003YeA0-MtpTwyYJ; Mon, 18 Aug 2025 17:06:53 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755526013; bh=3d3UPuB7M4BByxpoQwPGncY1dWDIJSAfRsgScbQZ1no=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=HlDGjH61G1hlApg+1Cxi3rjRTxlleTQzvlvTpZKK5Pn6u5j1lF2gwrbaFzVCVBQj7 RvOMLZqlBVdSMzp6kTq0dVBjeCIDrmd9+lC49RiUeT8VO1eYGtEfEP5kvDJOwWIIU2 Pl5pMK/nkGDvmvSM/Cw3DQ1TdDQ7YEN9l/1bJXxg= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru Subject: [PATCH 19/19] net/tap: drop net_tap_fd_init() Date: Mon, 18 Aug 2025 17:06:45 +0300 Message-ID: <20250818140645.27904-20-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250818140645.27904-1-vsementsov@yandex-team.ru> References: <20250818140645.27904-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1755526128682124100 Content-Type: text/plain; charset="utf-8" It's called only from net_init_tap_one(), and there is no semantic reason, why we do part of initialization in one function and continue in another. Let's combine them into one net_tap_fd_init_common(). Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 97 +++++++++++++++++++++++++------------------------------ 1 file changed, 44 insertions(+), 53 deletions(-) diff --git a/net/tap.c b/net/tap.c index fd977b748c..3b7d75e5a5 100644 --- a/net/tap.c +++ b/net/tap.c @@ -88,11 +88,12 @@ static void launch_script(const char *setup_script, con= st char *ifname, static void tap_send(void *opaque); static void tap_writable(void *opaque); =20 -static int net_init_tap_one(const Netdev *netdev, NetClientState *peer, - const char *model, const char *name, - const char *ifname, const char *script, - const char *downscript, const char *vhostfdnam= e, - int vnet_hdr, int fd, Error **errp); +static int net_tap_fd_init_common(const Netdev *netdev, NetClientState *pe= er, + const char *model, const char *name, + const char *ifname, const char *script, + const char *downscript, + const char *vhostfdname, + int vnet_hdr, int fd, Error **errp); static int net_tap_setup_vhost(TAPState *s, const NetdevTapOptions *tap, const char *vhostfdname, Error **errp); =20 @@ -393,42 +394,6 @@ static NetClientInfo net_tap_info =3D { .get_vhost_net =3D tap_get_vhost_net, }; =20 -static TAPState *net_tap_fd_init(NetClientState *peer, - const char *model, - const char *name, - int fd, - int vnet_hdr) -{ - NetClientState *nc; - TAPState *s; - - nc =3D qemu_new_net_client(&net_tap_info, peer, model, name); - - s =3D DO_UPCAST(TAPState, nc, nc); - - s->fd =3D fd; - s->host_vnet_hdr_len =3D vnet_hdr ? sizeof(struct virtio_net_hdr) : 0; - s->using_vnet_hdr =3D false; - s->has_ufo =3D tap_probe_has_ufo(s->fd); - s->has_uso =3D tap_probe_has_uso(s->fd); - s->enabled =3D true; - tap_set_offload(&s->nc, 0, 0, 0, 0, 0, 0, 0); - /* - * Make sure host header length is set correctly in tap: - * it might have been modified by another instance of qemu. - */ - if (vnet_hdr) { - tap_fd_set_vnet_hdr_len(s->fd, s->host_vnet_hdr_len); - } - tap_read_poll(s, true); - s->vhost_net =3D NULL; - - s->exit.notify =3D tap_exit_notify; - qemu_add_exit_notifier(&s->exit); - - return s; -} - static void close_all_fds_after_fork(int excluded_fd) { const int skip_fd[] =3D {STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO, @@ -651,9 +616,9 @@ static int net_tap_fd_init_external(const Netdev *netde= v, NetClientState *peer, } } =20 - return net_init_tap_one(netdev, peer, model, name, - NULL, NULL, NULL, - vhostfdname, vnet_hdr, fd, errp); + return net_tap_fd_init_common(netdev, peer, model, name, + NULL, NULL, NULL, + vhostfdname, vnet_hdr, fd, errp); } =20 int net_init_bridge(const Netdev *netdev, const char *name, @@ -723,9 +688,9 @@ static int net_tap_open_one(const Netdev *netdev, } } =20 - ret =3D net_init_tap_one(netdev, peer, "tap", name, ifname, - script, downscript, - tap->vhostfd, vnet_hdr, fd, errp); + ret =3D net_tap_fd_init_common(netdev, peer, "tap", name, ifname, + script, downscript, + tap->vhostfd, vnet_hdr, fd, errp); if (ret < 0) { close(fd); return -1; @@ -736,15 +701,41 @@ static int net_tap_open_one(const Netdev *netdev, =20 #define MAX_TAP_QUEUES 1024 =20 -static int net_init_tap_one(const Netdev *netdev, NetClientState *peer, - const char *model, const char *name, - const char *ifname, const char *script, - const char *downscript, const char *vhostfdnam= e, - int vnet_hdr, int fd, Error **errp) +static int net_tap_fd_init_common(const Netdev *netdev, NetClientState *pe= er, + const char *model, const char *name, + const char *ifname, const char *script, + const char *downscript, + const char *vhostfdname, + int vnet_hdr, int fd, Error **errp) { const NetdevTapOptions *tap; - TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int ret; + NetClientState *nc; + TAPState *s; + + nc =3D qemu_new_net_client(&net_tap_info, peer, model, name); + + s =3D DO_UPCAST(TAPState, nc, nc); + + s->fd =3D fd; + s->host_vnet_hdr_len =3D vnet_hdr ? sizeof(struct virtio_net_hdr) : 0; + s->using_vnet_hdr =3D false; + s->has_ufo =3D tap_probe_has_ufo(s->fd); + s->has_uso =3D tap_probe_has_uso(s->fd); + s->enabled =3D true; + tap_set_offload(&s->nc, 0, 0, 0, 0, 0, 0, 0); + /* + * Make sure host header length is set correctly in tap: + * it might have been modified by another instance of qemu. + */ + if (vnet_hdr) { + tap_fd_set_vnet_hdr_len(s->fd, s->host_vnet_hdr_len); + } + tap_read_poll(s, true); + s->vhost_net =3D NULL; + + s->exit.notify =3D tap_exit_notify; + qemu_add_exit_notifier(&s->exit); =20 if (netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE) { const NetdevBridgeOptions *bridge =3D &netdev->u.bridge; --=20 2.48.1