From nobody Sat Nov 15 07:45:54 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=1755526170; cv=none; d=zohomail.com; s=zohoarc; b=ZEEUD8vu9hoNvIdaeer+QqlJYk3NgsWDlrY4jqgmQMM4OH9I0ONa4sim3Iy/BB3pLXqwBUV0tk4iKfQH8JLrxiSE04aULi1xgPBYeZjit0JWdQB/Ps1HW7o+/9K+L71mOI9D40buXqnvdP2NSOyIv47MV+OxGpkrztMQJo314zA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755526170; 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=zxe/Qn8qaUIKSb9GVBdarhgmP62+YL/GaisgtgQiiKc=; b=KduhOuvn5/t6wpPjGIz5GDi9w0bFOPWZgNaZodHyUJ+S6TcDuQnnnot8vXRumZp5MEIP1WzL0IAS9IuFaulOxNq0k1cJbe4kcTyUYpGUQsJjdd0uQCdVUjLUOQ2b2lxta2ZVjFT80OHixF9OGeZW+HznWz/yKv9rWbwXYB1HEAw= 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 1755526170662859.5634825788007; Mon, 18 Aug 2025 07:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uo0Vq-0001OF-6U; Mon, 18 Aug 2025 10:07:02 -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 1uo0Vn-0001Lp-Pg for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:06:59 -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 1uo0Vl-0002CZ-SN for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:06:59 -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 86D8A807CE; Mon, 18 Aug 2025 17:06:51 +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-QlqtVJKk; Mon, 18 Aug 2025 17:06:51 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755526011; bh=zxe/Qn8qaUIKSb9GVBdarhgmP62+YL/GaisgtgQiiKc=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=wEBWPy/OsvKi1AjPLCwJ/9et6xBBjtjv3gB6ghUfXYRSpCPM1N6VAmrM0/TVtN0yq Z3KpgWiWkDKIshqLz5QHOyXUlCDXwMTq6Be6QqOsp/3PC4tTVdQAYrnL7UkgghKFv6 VTATcsTH1xQRU2T+MUhBSi60d/CEvtj0vKTGlo+M= 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 12/19] net/tap: net_init_tap_one(): support bridge Date: Mon, 18 Aug 2025 17:06:38 +0300 Message-ID: <20250818140645.27904-13-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: 1755526172240116600 Content-Type: text/plain; charset="utf-8" Use net_init_tap_one() in net_init_bridge(). Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/net/tap.c b/net/tap.c index 468dae7004..5acfb128a1 100644 --- a/net/tap.c +++ b/net/tap.c @@ -88,6 +88,12 @@ static void launch_script(const char *setup_script, cons= t 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 void tap_update_fd_handler(TAPState *s) { qemu_set_fd_handler(s->fd, @@ -626,8 +632,7 @@ int net_init_bridge(const Netdev *netdev, const char *n= ame, { const NetdevBridgeOptions *bridge; const char *helper, *br; - TAPState *s; - int fd, vnet_hdr; + int fd, vnet_hdr, ret; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE); bridge =3D &netdev->u.bridge; @@ -648,9 +653,14 @@ int net_init_bridge(const Netdev *netdev, const char *= name, close(fd); return -1; } - s =3D net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr); =20 - qemu_set_info_str(&s->nc, "helper=3D%s,br=3D%s", helper, br); + ret =3D net_init_tap_one(netdev, peer, "bridge", name, + NULL, NULL, NULL, + NULL, vnet_hdr, fd, errp); + if (ret < 0) { + close(fd); + return -1; + } =20 return 0; } @@ -698,11 +708,19 @@ static int net_init_tap_one(const Netdev *netdev, Net= ClientState *peer, const char *downscript, const char *vhostfdnam= e, int vnet_hdr, int fd, Error **errp) { - const NetdevTapOptions *tap =3D &netdev->u.tap; + const NetdevTapOptions *tap; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; =20 + if (netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE) { + const NetdevBridgeOptions *bridge =3D &netdev->u.bridge; + qemu_set_info_str(&s->nc, "helper=3D%s,br=3D%s", + bridge->helper, bridge->br); + return 0; + } + assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); + tap =3D &netdev->u.tap; =20 if (tap_set_sndbuf(s->fd, tap, errp) < 0) { goto failed; --=20 2.48.1