From nobody Sat Nov 15 07:45:52 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=1755526047; cv=none; d=zohomail.com; s=zohoarc; b=gcHRzVui/yyuCJRbXMHa1QLSKllSl70tdnfXlQXpbH2JAv9ugTBIj5lBMzyNO4LYc2BuF9dBXtEhDYSb2L4upsO7xvZOWC195QuBlH+AnlXxvpVIjeljEgRS2rV0+ideCCBC+lSXID3/H72/2Byp0grsr2YTQlPJRNIyJmn/+jM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755526047; 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=mFfBV1uR7UUVO/tCfL9KGV9z2B+nrC4acvDAvbLz5QE=; b=eOVIUcQuRdfD7teJgtPl37gLfm7/IfOpmvSDXDy/ctxs5qzvLxTTEJrHnwg7c4dgjDkP1ci9qjGooJJijpTvOaTbkcvaZ3nJUnmPxy7/L1lnaH8/UEbaFG8/G5Frw2mnisq+xbv0i8cBzc+0Gix9nSOl/6WJjUN1Hpv/hK3aZig= 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 1755526046947454.541884309847; Mon, 18 Aug 2025 07:07:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uo0Vz-0001nA-Te; Mon, 18 Aug 2025 10:07:11 -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 1uo0Vy-0001mV-5B for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:10 -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 1uo0Vw-0002Cx-F6 for qemu-devel@nongnu.org; Mon, 18 Aug 2025 10:07:09 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c21:2d8b:0:640:7d49:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 5E2AD807D5; Mon, 18 Aug 2025 17:06:53 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b25::1:17]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id k6RC4003YeA0-IDsDiw6q; Mon, 18 Aug 2025 17:06:53 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755526013; bh=mFfBV1uR7UUVO/tCfL9KGV9z2B+nrC4acvDAvbLz5QE=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=V4eR+crRTMxjC/Xpdjz0gZdg0NxzUEKTRF1nRDKxhkCmLWskelvHrcB4FO5f6Z1HN aRnX6geRxXULcuukZeFNfOkL2aeIIwmMybWUKWeeuHHQavk+sx/bjXgsP6xjutpZl2 EsjqnOlX3LGHWCPqU8uQUYzlQ3hchsUoXJ+sOEW0= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.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 Subject: [PATCH 17/19] net/tap: introduce net_tap_from_monitor_fd() helper Date: Mon, 18 Aug 2025 17:06:43 +0300 Message-ID: <20250818140645.27904-18-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250818140645.27904-1-vsementsov@yandex-team.ru> References: <20250818140645.27904-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: 1755526052600124100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/net/tap.c b/net/tap.c index 09c1343ccc..93db3c47f8 100644 --- a/net/tap.c +++ b/net/tap.c @@ -827,6 +827,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, @@ -874,7 +888,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); @@ -906,16 +920,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; - } - - ret =3D net_tap_fd_init_external(netdev, peer, "tap", name, - tap->vhostfd, NULL, fd, errp); - if (ret < 0) { - return -1; - } + 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; @@ -940,14 +946,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