From nobody Sat Nov 15 05:18:17 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=1755965154; cv=none; d=zohomail.com; s=zohoarc; b=g3YXSQ77eCVxFV5U1Z6iQda25P1buc1qO5XzYdDbEOR035eeGWarJz85nvt1eBXB9uyjw2Nx4ReOtPMZCAafr20Enxaz2GKSCjt87CH89GVcLxKvbOZAKV31EO4yBVD6ppY3QMj8vFYVjHB9M+1GfmXjOwjWqqX31AUzJEgiLPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755965154; 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=9w3QClpqsLPtFcNR/rxasMLiSjbct8d5Q3AT/oDKknU=; b=gQ8IrUcThdfTbol+BB2kHcrTuc1v/HQmGD0bMkVKRajR2KRHSPP4Pt7/bt0SvvI8FNM/oh9bsvLgRYtJO3kQgktYYPR05Zc/JiaxB6p31YLjsPt0f3WGtiXtXxl8D//xQRrLfqgpP1WeLltbfn2Gb16B56dUpiIZePpKJEpHvXY= 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 1755965154089379.10567573036656; Sat, 23 Aug 2025 09:05:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upqio-0005Ri-1R; Sat, 23 Aug 2025 12:04: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 1upqiS-0005L9-5V for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:42 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upqiP-0000It-TQ for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:39 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c23:36c1:0:640:5f85:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 0E72780782; Sat, 23 Aug 2025 19:03:34 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:c91::1:b]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Q3YUrj0Gl8c0-lyk6am5m; Sat, 23 Aug 2025 19:03:33 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755965013; bh=9w3QClpqsLPtFcNR/rxasMLiSjbct8d5Q3AT/oDKknU=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=Ysc3H2Ar4gr8w/BjpRdsbTxt9PF+9mSDTsnrqT5qs+M1ZyP0bkcbziY+nY1ZiI6my Pj4U4s9V6h+NmV+ZlQbeT56oMN2un+NiwrKrvveSPoKiRTC1mDmSDZKNIrapZuYji8 8B8KXY04pagv7U3rsXEMbR/jVsrNSUtVd0KEVPgE= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.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, leiyang@redhat.com, steven.sistare@oracle.com Subject: [PATCH v2 13/20] net/tap: net_init_bridge(): support tap Date: Sat, 23 Aug 2025 19:03:16 +0300 Message-ID: <20250823160323.20811-14-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250823160323.20811-1-vsementsov@yandex-team.ru> References: <20250823160323.20811-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.136; 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, 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 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: 1755965155636116600 Content-Type: text/plain; charset="utf-8" Support tap in net_init_bridge() and reuse it for corresponding case in net_init_tap(). Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/net/tap.c b/net/tap.c index 5acfb128a1..83a1c9250a 100644 --- a/net/tap.c +++ b/net/tap.c @@ -630,16 +630,24 @@ static bool set_fd_nonblocking(int fd, const char *no= te, Error **errp) int net_init_bridge(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { - const NetdevBridgeOptions *bridge; + const NetdevTapOptions *tap =3D NULL; + const NetdevBridgeOptions *bridge =3D NULL; const char *helper, *br; int fd, vnet_hdr, ret; =20 - assert(netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE); - bridge =3D &netdev->u.bridge; - helper =3D bridge->helper; - br =3D bridge->br ?: DEFAULT_BRIDGE_INTERFACE; + if (netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE) { + bridge =3D &netdev->u.bridge; + helper =3D bridge->helper; + br =3D bridge->br; + } else { + assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); =20 - fd =3D net_bridge_run_helper(helper, br, errp); + tap =3D &netdev->u.tap; + helper =3D tap->helper; + br =3D tap->br; + } + + fd =3D net_bridge_run_helper(helper, br ?: DEFAULT_BRIDGE_INTERFACE, e= rrp); if (fd =3D=3D -1) { return -1; } @@ -656,7 +664,8 @@ int net_init_bridge(const Netdev *netdev, const char *n= ame, =20 ret =3D net_init_tap_one(netdev, peer, "bridge", name, NULL, NULL, NULL, - NULL, vnet_hdr, fd, errp); + tap ? tap->vhostfd : NULL, + vnet_hdr, fd, errp); if (ret < 0) { close(fd); return -1; @@ -910,29 +919,7 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, return -1; } =20 - fd =3D net_bridge_run_helper(tap->helper, - tap->br ?: DEFAULT_BRIDGE_INTERFACE, - errp); - if (fd =3D=3D -1) { - return -1; - } - - if (!set_fd_nonblocking(fd, name, errp)) { - return -1; - } - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); - if (vnet_hdr < 0) { - close(fd); - return -1; - } - - ret =3D net_init_tap_one(netdev, peer, "bridge", name, NULL, - NULL, NULL, tap->vhostfd, - vnet_hdr, fd, errp); - if (ret < 0) { - close(fd); - return -1; - } + return net_init_bridge(netdev, name, peer, errp); } else { const char *script =3D tap->script; const char *downscript =3D tap->downscript; --=20 2.48.1