From nobody Sat Sep 6 17:22:35 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=1756903899; cv=none; d=zohomail.com; s=zohoarc; b=MMdYAWRzt6gwfllzrbNcpmDkfEkGP59zhteS7sonnLTFJr/gZTrXBBeEuMjzrqcKQil+Z99ZOSgdIm6FR8Cyg2G2MgMUWeisM2eEOr4FLTeiooA1k4uitM1PHX9zF3GZLy1yOGv2XC8NwwUsLVmocBt/Z3JcgNbOoT12miACmFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756903899; 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=m/hFLQMDX/lCZxfgHLZhE6GJfd+gtZ+BLeDe492dlkM=; b=XI9l9ucM2dPBVe+LQiNCeyYYfcuFTTdNSETb6QFmpcgN1uXtI1ONGZ75MZUHKSvKUA6qJGLYzz71OIbmdMoEdc2qFsyjJnqDAStwr166u4dl3vx6gkGSWzzxym2YHLJe4/CUmMUKZpEbChsja2Ezcc8UlkQcg7hTAk1tgsSFEL4= 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 1756903898202341.8475477349807; Wed, 3 Sep 2025 05:51:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmwK-0006D8-PP; Wed, 03 Sep 2025 08:50:18 -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 1utmw6-00063r-Tl for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:50:03 -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 1utmw5-0000o6-37 for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:50:02 -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 3FED8C0162; Wed, 03 Sep 2025 15:49:49 +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-4jtuwM2G; Wed, 03 Sep 2025 15:49:48 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903788; bh=m/hFLQMDX/lCZxfgHLZhE6GJfd+gtZ+BLeDe492dlkM=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=HrN3koCUAIhNDJ9ll8pRGM+WiLDFo+RDKSupUyzD575dio4khLFlu5qNntIyMPr/g 0JbVr68pUrJDO/35trAQXhe+Tie1oA5KyozNp77ZFn+7q9biGoF6Us7DUDcNphFjwB FZ7JH2PQXGNEiOrp51Q2qqvcHo5g5UdmapTQF4N8= 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 19/19] net/tap: introduce net_init_tap_fds() Date: Wed, 3 Sep 2025 15:49:33 +0300 Message-ID: <20250903124934.1169899-20-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: 1756903900162116600 Content-Type: text/plain; charset="utf-8" Final refactoring step for net_init_tap: move fds case to separate function, so that net_init_tap() becomes straightforward top-level entry point to tap initialization. Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 68 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/net/tap.c b/net/tap.c index 5ad6f6af85..2530627a9a 100644 --- a/net/tap.c +++ b/net/tap.c @@ -877,12 +877,48 @@ static int net_tap_open(const Netdev *netdev, return 0; } =20 +static int net_init_tap_fds(const Netdev *netdev, const char *name, + NetClientState *peer, Error **errp) +{ + const NetdevTapOptions *tap =3D &netdev->u.tap; + g_auto(GStrv) fds =3D NULL; + g_auto(GStrv) vhost_fds =3D NULL; + int nfds; + int vnet_hdr =3D 0, i =3D 0; + int ret; + + assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); + + fds =3D g_strsplit(tap->fds, ":", MAX_TAP_QUEUES); + nfds =3D g_strv_length(fds); + + if (tap->vhostfds) { + vhost_fds =3D g_strsplit(tap->vhostfds, ":", MAX_TAP_QUEUES); + if (nfds !=3D g_strv_length(vhost_fds)) { + error_setg(errp, "The number of fds passed does not match " + "the number of vhostfds passed"); + return -1; + } + } + + vnet_hdr =3D -1; + for (i =3D 0; i < nfds; i++) { + ret =3D net_tap_from_monitor_fd(netdev, peer, name, + vhost_fds ? vhost_fds[i] : NULL, + &vnet_hdr, fds[i], errp); + if (ret < 0) { + return -1; + } + } + + return 0; +} + + int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { const NetdevTapOptions *tap =3D &netdev->u.tap; - int vnet_hdr =3D 0, i =3D 0; - int ret =3D 0; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); =20 @@ -916,38 +952,12 @@ int net_init_tap(const Netdev *netdev, const char *na= me, 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; - int nfds; - if (tap->helper || tap->vhostfd) { error_setg(errp, "helper=3D and vhostfd=3D are invalid with fd= s=3D"); return -1; } =20 - fds =3D g_strsplit(tap->fds, ":", MAX_TAP_QUEUES); - nfds =3D g_strv_length(fds); - - if (tap->vhostfds) { - vhost_fds =3D g_strsplit(tap->vhostfds, ":", MAX_TAP_QUEUES); - if (nfds !=3D g_strv_length(vhost_fds)) { - error_setg(errp, "The number of fds passed does not match " - "the number of vhostfds passed"); - return -1; - } - } - - vnet_hdr =3D -1; - for (i =3D 0; i < nfds; i++) { - ret =3D net_tap_from_monitor_fd(netdev, peer, name, - vhost_fds ? vhost_fds[i] : NULL, - &vnet_hdr, fds[i], errp); - if (ret < 0) { - return -1; - } - } - - return 0; + return net_init_tap_fds(netdev, name, peer, errp); } else if (tap->helper) { if (tap->vhostfds) { error_setg(errp, "vhostfds=3D is invalid with helper=3D"); --=20 2.48.1