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=1756904033; cv=none; d=zohomail.com; s=zohoarc; b=JQ3M49fJKrlZKudZVaHPq/6eGLi7woeB8QUVcFK8m7txunA68XO6rkqj/3fq2cZZezFC5LkMJhq1QhcPYcmW4rowVN2Hm9W0+wI1hM4hYqze5yVB5coUzbz0F2xvEEJ+HpHCXnW1Xk1qyb1/MkVHe9udOJK4PCvI92eJnrqpgyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756904033; 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=Ij82BMCypSjIMbT/HzIhCBD8q/fXCD0qoLK28qqYVDQ=; b=kAtqpo9p8m7AHLnVnGVym8JG8B4Ua13XEeSs0HPZ5V9QSxSHc/Jk12W1GoZncvA8OtYS/Su7L/e1e8g/4sRj4SZrLakfrX6jWfr93bC2aPPrMsjyhx/+9Fw5S7ZznrFHWrFQ62sRb8N0CfdH1H9yFIT1JlCuGUYGBB7O3sfUvOw= 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 1756904033250264.79641778211885; Wed, 3 Sep 2025 05:53:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmw5-000638-Og; Wed, 03 Sep 2025 08:50:01 -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 1utmw0-0005xt-Pt for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:56 -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 1utmvv-0000nx-1q for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:55 -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 054F1C01BC; Wed, 03 Sep 2025 15:49:46 +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-sSI9gNus; Wed, 03 Sep 2025 15:49:45 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903785; bh=Ij82BMCypSjIMbT/HzIhCBD8q/fXCD0qoLK28qqYVDQ=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=iJ/vv6h28jD3Qslc0XD6kDy9s98be9zjUaXF25hbkqY3s3eOg5E8B96vj1x8gucRB 84FAIuTjIl+O56bExc6Mvw7M1J+x1+1veKvJToRUQWjev0nxDfMkwKLH0mxGdD//gz 5jHugKDWDkcDr67o/IyHzfTlK6uY8nk8JV688QPY= 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 16/19] net/tap: introduce net_tap_from_monitor_fd() helper Date: Wed, 3 Sep 2025 15:49:30 +0300 Message-ID: <20250903124934.1169899-17-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: 1756904034920124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/net/tap.c b/net/tap.c index 4da3f36b31..0802da7d58 100644 --- a/net/tap.c +++ b/net/tap.c @@ -815,6 +815,20 @@ failed: return -1; } =20 +static int net_tap_from_monitor_fd(const Netdev *netdev, NetClientState *p= eer, + const char *name, const char *vhostfdna= me, + int *pvnet_hdr, const char *fdname, + Error **errp) +{ + int fd =3D monitor_fd_param(monitor_cur(), fdname, errp); + if (fd =3D=3D -1) { + return -1; + } + + return net_tap_fd_init_external(netdev, peer, "tap", name, + vhostfdname, pvnet_hdr, fd, errp); +} + static int net_tap_open(const Netdev *netdev, const char *name, NetClientState *peer, @@ -862,7 +876,7 @@ int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { const NetdevTapOptions *tap =3D &netdev->u.tap; - int fd, vnet_hdr =3D 0, i =3D 0; + int vnet_hdr =3D 0, i =3D 0; int ret =3D 0; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); @@ -894,13 +908,8 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, return -1; } =20 - fd =3D monitor_fd_param(monitor_cur(), tap->fd, errp); - if (fd =3D=3D -1) { - return -1; - } - - return net_tap_fd_init_external(netdev, peer, "tap", name, - tap->vhostfd, NULL, fd, errp); + return net_tap_from_monitor_fd(netdev, peer, name, tap->vhostfd, + NULL, tap->fd, errp); } else if (tap->fds) { g_auto(GStrv) fds =3D NULL; g_auto(GStrv) vhost_fds =3D NULL; @@ -925,14 +934,9 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, =20 vnet_hdr =3D -1; for (i =3D 0; i < nfds; i++) { - fd =3D monitor_fd_param(monitor_cur(), fds[i], errp); - if (fd =3D=3D -1) { - return -1; - } - - ret =3D net_tap_fd_init_external(netdev, peer, "tap", name, + ret =3D net_tap_from_monitor_fd(netdev, peer, name, vhost_fds ? vhost_fds[i] : NULL, - &vnet_hdr, fd, errp); + &vnet_hdr, fds[i], errp); if (ret < 0) { return -1; } --=20 2.48.1