From nobody Tue Feb 10 09:10:35 2026 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=1769722379; cv=none; d=zohomail.com; s=zohoarc; b=iH5LH/sG+Mxoeug7aN+NHxbTl9p2EMHo29MqYEjBt7XiOpgskVygdF/JxhbXepH8HdbkkNXo6BhZqQDxx68JR4yU+Cg5Ejj38z9SakookNPfyVEzyuz/wtcvFq9+bYShWaQ8gde8OcBv1qB12DBelSQ2JeW2ooesEA4PxhsPDd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769722379; 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=i5eFvQ0MxbzUcT/0vb8vt3GzyP2XMPog1nxdutvP964=; b=UFkoCQyMVaKD7X/IxwjU7MNgCfBHeJlxSlEm82t2AKG5wTVSyoBTokPUOya/cYRMB0PZHmSbtD0E6T7ayETpslZWjF7bUEHRHbzRbCs7HOvDYFgCip7KLMRQmyEQBU672WqvPIrPsYRWXfFWwX3J2koAJoxgnA2f0ICSlZ6aBF8= 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 1769722379036741.2227801431826; Thu, 29 Jan 2026 13:32:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlZcs-0001Wu-Pf; Thu, 29 Jan 2026 16:32:30 -0500 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 1vlZcq-0001Ud-BQ for qemu-devel@nongnu.org; Thu, 29 Jan 2026 16:32:28 -0500 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900: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 1vlZcm-00017f-Ci for qemu-devel@nongnu.org; Thu, 29 Jan 2026 16:32:28 -0500 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:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 758A380818; Fri, 30 Jan 2026 00:32:22 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:b74::1:d]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id IWrbZO5AAOs0-vCtg7Wve; Fri, 30 Jan 2026 00:32:22 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1769722342; bh=i5eFvQ0MxbzUcT/0vb8vt3GzyP2XMPog1nxdutvP964=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=wsauAu4/O6qxQB4LYzPXVzwyAD8RwxuK6A6HciWR7AScHnhuegA/TUjJ6jQXs8Ww+ 8bUeQhqrw1xtu+SperUWgoztfBi0h7txh8UtsKQNteVn+eDi7aSHPrCUPr2ZasM/VA Nv7RwmxO1TKg0wfezLnGxRDoAZP2n3hi1QFNZZq0= 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, bchaney@akamai.com, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, davydov-max@yandex-team.ru, vsementsov@yandex-team.ru Subject: [PATCH v2 04/12] net/tap: net_init_tap(): refactor parameter checking Date: Fri, 30 Jan 2026 00:32:06 +0300 Message-ID: <20260129213215.1405459-5-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129213215.1405459-1-vsementsov@yandex-team.ru> References: <20260129213215.1405459-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:c02:900:1:45:d181:df01; 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, 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: qemu development 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: 1769722382701154100 Content-Type: text/plain; charset="utf-8" Move checks to the top of the function to simplify further refactoring. Merge duplicated checks. Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 53 +++++++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/net/tap.c b/net/tap.c index 55b8b33ea8..331a779585 100644 --- a/net/tap.c +++ b/net/tap.c @@ -841,16 +841,30 @@ int net_init_tap(const Netdev *netdev, const char *na= me, return -1; } =20 - if (tap->fd) { - if (tap->ifname || tap->script || tap->downscript || - tap->has_vnet_hdr || tap->helper || tap->has_queues || - tap->fds || tap->vhostfds) { - error_setg(errp, "ifname=3D, script=3D, downscript=3D, vnet_hd= r=3D, " - "helper=3D, queues=3D, fds=3D, and vhostfds=3D " - "are invalid with fd=3D"); - return -1; - } + if (tap->has_queues + !!tap->helper + !!tap->fds + !!tap->fd > 1) { + error_setg(errp, "queues=3D, helper=3D, fds=3D and fd=3D are mutua= l exclusive"); + return -1; + } =20 + if ((tap->fd || tap->fds || tap->helper) && + (tap->ifname || tap->script || tap->downscript || + tap->has_vnet_hdr)) { + error_setg(errp, "ifname=3D, script=3D, downscript=3D, vnet_hdr=3D= " + "are invalid with fd=3D/fds=3D/helper=3D"); + return -1; + } + + if (tap->vhostfds && !tap->fds) { + error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't specifie= d"); + return -1; + } + + if (tap->vhostfd && tap->fds) { + error_setg(errp, "vhostfd=3D is invalid with fds=3D"); + return -1; + } + + if (tap->fd) { fd =3D monitor_fd_param(monitor_cur(), tap->fd, errp); if (fd =3D=3D -1) { return -1; @@ -878,15 +892,6 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, char **vhost_fds; int nfds =3D 0, nvhosts =3D 0; =20 - if (tap->ifname || tap->script || tap->downscript || - tap->has_vnet_hdr || tap->helper || tap->has_queues || - tap->vhostfd) { - error_setg(errp, "ifname=3D, script=3D, downscript=3D, vnet_hd= r=3D, " - "helper=3D, queues=3D, and vhostfd=3D " - "are invalid with fds=3D"); - return -1; - } - fds =3D g_new0(char *, MAX_TAP_QUEUES); vhost_fds =3D g_new0(char *, MAX_TAP_QUEUES); =20 @@ -946,13 +951,6 @@ free_fail: g_free(vhost_fds); return ret; } else if (tap->helper) { - if (tap->ifname || tap->script || tap->downscript || - tap->has_vnet_hdr || tap->has_queues || tap->vhostfds) { - error_setg(errp, "ifname=3D, script=3D, downscript=3D, vnet_hd= r=3D, " - "queues=3D, and vhostfds=3D are invalid with helper= =3D"); - return -1; - } - fd =3D net_bridge_run_helper(tap->helper, tap->br ?: DEFAULT_BRIDGE_INTERFACE, errp); @@ -981,11 +979,6 @@ free_fail: g_autofree char *downscript =3D tap_parse_script(tap->downscript, DEFAULT_NETWORK_DOWN_SCRIPT); =20 - if (tap->vhostfds) { - error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't spec= ified"); - return -1; - } - if (tap->ifname) { pstrcpy(ifname, sizeof ifname, tap->ifname); } else { --=20 2.52.0