From nobody Sat Sep 6 17:17:09 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=1756904023; cv=none; d=zohomail.com; s=zohoarc; b=iWVqD1m6wEg1iIhQUeDmxTQJtYOST/5zNFCRcYYaUMHsJzRsT4vX37tlMRxpxlaWG2I55BJdnrKdXMu88HQw2tzXWOIR4CbpZ4+SSA1eRKhvwXhCa5o95ynrOrpidvXCk0RpsJ8GcxArryH8D46FhtWRdAmq+blp5ZT/no6afMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756904023; 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=FhJML9Otr3dUT6ZxMqz6k3sNazn9e3KFCnS6Z7ENET4=; b=EcVCkUBl3rDNFsW3DOhD9EUUDiRl+fVEqV6SvqT0GJ65DjBTsQoXmJwb0Vl5zNFGv+1brycr9BksT+h5G+j66FDtZYr8eBh2T7BptfbDX99MeyXgTNuwvI9KqgOgWTk5wGVVyf7xVGPjoYBhXUAILKJ3Bj5hX/zjIvAJmTr3B7E= 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 1756904023593237.20851521363738; Wed, 3 Sep 2025 05:53:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmw6-00063P-CQ; Wed, 03 Sep 2025 08:50: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 1utmvy-0005x5-SH for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:54 -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-0000ns-TN for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:53 -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 D8C56C0196; 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-sQeIegh0; Wed, 03 Sep 2025 15:49:43 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903783; bh=FhJML9Otr3dUT6ZxMqz6k3sNazn9e3KFCnS6Z7ENET4=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=RWtyCfuoFSF5lHJC64OVQyWEjy1MLSSx5PI/r7qFXjyn8My9j4zL2/EX0wmbd7a51 HcC1D/bBWj5mOeo0V7qCUJw8DphHujkjNwVrtHLn1BcdAMRdKRU/ry/4rYxzxT1893 KdEBD7FDhjRWR+g6KmuMsXgp+byZHYIpxbCa2KN0= 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 12/19] net/tap: net_init_bridge(): support tap Date: Wed, 3 Sep 2025 15:49:26 +0300 Message-ID: <20250903124934.1169899-13-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: 1756904024975124100 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 Tested-by: Lei Yang --- net/tap.c | 47 +++++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/net/tap.c b/net/tap.c index 01f9277211..79225fb233 100644 --- a/net/tap.c +++ b/net/tap.c @@ -618,16 +618,24 @@ static int net_bridge_run_helper(const char *helper, = const char *bridge, 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); + + tap =3D &netdev->u.tap; + helper =3D tap->helper; + br =3D tap->br; + } =20 - fd =3D net_bridge_run_helper(helper, br, errp); + fd =3D net_bridge_run_helper(helper, br ?: DEFAULT_BRIDGE_INTERFACE, e= rrp); if (fd =3D=3D -1) { return -1; } @@ -643,7 +651,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; @@ -897,29 +906,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 (!qemu_set_blocking(fd, false, 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