From nobody Sat Sep 6 17:17:08 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=1756903851; cv=none; d=zohomail.com; s=zohoarc; b=JXlBoLBUzSlNejunt1y1gd9YvHABUWjXeponsMQKuhs1c2N/Fz03+NBcxWCte9bYL8UeVCniDyAm3WKVrFApyCwdRqrOvx2yQow5AI5O2JrW16co9O66kHpSFq+NPHeXQPsgmKhfAGT2fysseevd8VxOOvq3ry6Jp/SZ+qR6iYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756903851; 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=AWe/NvzEYfuBKOxLSJ1su4BUutR6kWpN1uG/Rl7YzJ0=; b=gUfRVlbLsKHwNO7BxVAu1lJXH/JoQlcUZL5vCP+O5V9vr+5cV/g4t15cshcUl8DxEgCoRRr1aqrGnqIsByJMKliWUgVhkos8vAME7IUcjm9MjFgwzOIAAPftSQXKyCUgAG++1sIcsGk4xfa/pEbrgGr+XYJcUs8DnEkXMJhDipQ= 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 1756903851189225.130786429983; Wed, 3 Sep 2025 05:50:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmwI-0006Ce-KV; Wed, 03 Sep 2025 08:50:16 -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 1utmvw-0005wZ-SU for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:52 -0400 Received: from forwardcorp1a.mail.yandex.net ([178.154.239.72]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utmvu-0000nU-MS for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:52 -0400 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:7394:0:640:5a8a:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id D033BC0192; Wed, 03 Sep 2025 15:49:42 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b8f::1:11]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id anf8gZ3GnW20-EmxUYIwi; Wed, 03 Sep 2025 15:49:42 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903782; bh=AWe/NvzEYfuBKOxLSJ1su4BUutR6kWpN1uG/Rl7YzJ0=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=hWkmBEiTFcW3+kOu729uQ1/Is6GRbEXEfMfoCbMYVoebx2mtzEZs8VQfA3RF+gXJq LyAqZIlCW4v7Tj6oHLFu9VpwvZu8DAlmwooXMe+rhYW8zfQSvRAjxgooY6D36Ygt8X 3ji63GOiYpnnvvEB0sb8oopmlLZwDfnBkhbN6QkY= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.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, leiyang@redhat.com, steven.sistare@oracle.com, yc-core@yandex-team.ru Subject: [PATCH v3 10/19] net/tap: net_init_tap_one(): refactor to use netdev as first arg Date: Wed, 3 Sep 2025 15:49:24 +0300 Message-ID: <20250903124934.1169899-11-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250903124934.1169899-1-vsementsov@yandex-team.ru> References: <20250903124934.1169899-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=178.154.239.72; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 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: 1756903854961124100 Content-Type: text/plain; charset="utf-8" This is needed for further unification of bridge initialization in net_init_tap() and net_init_bridge(). Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net/tap.c b/net/tap.c index c007cd272a..7dc8f52831 100644 --- a/net/tap.c +++ b/net/tap.c @@ -679,15 +679,18 @@ static int net_tap_init(const NetdevTapOptions *tap, = int *vnet_hdr, =20 #define MAX_TAP_QUEUES 1024 =20 -static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *p= eer, +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) { + const NetdevTapOptions *tap =3D &netdev->u.tap; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; =20 + assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); + if (tap_set_sndbuf(s->fd, tap, errp) < 0) { goto failed; } @@ -813,7 +816,7 @@ int net_init_tap(const Netdev *netdev, const char *name, return -1; } =20 - ret =3D net_init_tap_one(tap, peer, "tap", name, NULL, + ret =3D net_init_tap_one(netdev, peer, "tap", name, NULL, NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp); if (ret < 0) { @@ -862,7 +865,7 @@ int net_init_tap(const Netdev *netdev, const char *name, return -1; } =20 - ret =3D net_init_tap_one(tap, peer, "tap", name, NULL, + ret =3D net_init_tap_one(netdev, peer, "tap", name, NULL, NULL, NULL, vhost_fds ? vhost_fds[i] : NULL, vnet_hdr, fd, errp); @@ -892,7 +895,7 @@ int net_init_tap(const Netdev *netdev, const char *name, return -1; } =20 - ret =3D net_init_tap_one(tap, peer, "bridge", name, NULL, + ret =3D net_init_tap_one(netdev, peer, "bridge", name, NULL, NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp); if (ret < 0) { @@ -933,7 +936,7 @@ int net_init_tap(const Netdev *netdev, const char *name, return -1; } =20 - ret =3D net_init_tap_one(tap, peer, "tap", name, ifname, + ret =3D net_init_tap_one(netdev, peer, "tap", name, ifname, i >=3D 1 ? "no" : script, i >=3D 1 ? "no" : downscript, tap->vhostfd, vnet_hdr, fd, errp); --=20 2.48.1