From nobody Sat Sep 6 17:22:36 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=1756903865; cv=none; d=zohomail.com; s=zohoarc; b=MWVS+gKt+hGclGC85CJQ90+kEFC8Wr10uU/PxsdYVPI0i+X3JSauaK5JC+MuECRCJ9rkjR9rxqnoeEKb27z/P//R2wHK1/8x/W70zIOURwDLxSc6/bUB+3f8iRiXj8QLGFepGMdXq41Y/tC7rqp2qMrdgnAD9Xg+fIaIVyZgoSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756903865; 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=V09EVXB3RmUezu8R1HKszNv0Wmt33AxVwbk6HH4OJwY=; b=gqQb5ebX1D4flvEh98agPiUpIhI62n2ibufcx6NOrY5I6CBJ6k1MottEITQJpUsQLtetDD2vN9cxZrxPcX2TcEfAX7zJvzuVQHbXY/RE77AZd/UaQw7hBLAaEECgMj4ZgGDl+QPTIUy7rroTX+YBW89v+ppKiWrJRnsppqs3EKM= 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 1756903865282481.92935277784613; Wed, 3 Sep 2025 05:51:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmw1-0005yH-Dy; Wed, 03 Sep 2025 08:49:57 -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-0005wK-Fp for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:52 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500: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 1utmvu-0000nT-ML 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 65FDBC01B7; Wed, 03 Sep 2025 15:49:43 +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-HhgGUC9M; 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=V09EVXB3RmUezu8R1HKszNv0Wmt33AxVwbk6HH4OJwY=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=Z5fW5uKUvTo5Lp0oyH5H8wh5gtJjOLsHaHAkqRroUsCMb0sCqIqeiYssrR1n3wVoC Ml8TjnSxYu2rZ6/s6/5jsrk5wLRUJedK7Ux0QNYKCvfYt55zf8sAniuQ5vydZIDcr1 jMtsfp4wyQ+9P5yKMHg5KSPfLCZL8dkED/JePS0E= 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 11/19] net/tap: net_init_tap_one(): support bridge Date: Wed, 3 Sep 2025 15:49:25 +0300 Message-ID: <20250903124934.1169899-12-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=2a02:6b8:c0e:500:1:45:d181:df01; 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_DNSWL_NONE=-0.0001, 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: 1756903865690116600 Content-Type: text/plain; charset="utf-8" Use net_init_tap_one() in net_init_bridge() to be able in further commits use net_init_bridge for "bridge" case of init_tap, as it has the same first part, but requires tap-related things in net_init_tap_one. Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/net/tap.c b/net/tap.c index 7dc8f52831..01f9277211 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, @@ -614,8 +620,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; @@ -635,9 +640,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; } @@ -685,11 +695,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