From nobody Sun Dec 14 12:17:27 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=quarantine dis=none) header.from=akamai.com ARC-Seal: i=1; a=rsa-sha256; t=1764787997; cv=none; d=zohomail.com; s=zohoarc; b=HgrWvS1c0AHZvTFrICOiXupdo3dDSL+RsSE/y0rsC8/YTfZYXGv0Nha1eJvA9kik9KpON0iTXwqUtcSZCfzviXNX6kWnYHG7dn8soyvRg/tZWwLn/93IK5mDQJewINuDIL43VXeLOGybdMi9+qXYo3Bn6jfAgXsA3nJGSY5kD0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764787997; h=Content-Type: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=NID9cQ6TVR/7DxrIYOVpRG111sFYubPS/LHG9jXZ0ns=; b=hkWCX+85XBduiE76bxbY5HXi53dT5335pxJWwVrFDJvCmOPe+A+TXKnN+SNKL5mjDMuk2ww0CruKsWjRP6Qqy01E6HcVr1m7wQBG/10hLFTMEWtI9MzUo/GiODvZ2aR/eXWzzGrCKBVeAm+fKY+28ArPDFTCkA4BDmKVwmvOz54= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764787997246664.5277403800862; Wed, 3 Dec 2025 10:53:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQrws-0007U1-Bg; Wed, 03 Dec 2025 13:51:34 -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 1vQrwr-0007T3-4J for qemu-devel@nongnu.org; Wed, 03 Dec 2025 13:51:33 -0500 Received: from mx0a-00190b01.pphosted.com ([2620:100:9001:583::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vQrwo-0000ze-29 for qemu-devel@nongnu.org; Wed, 03 Dec 2025 13:51:32 -0500 Received: from pps.filterd (m0050093.ppops.net [127.0.0.1]) by m0050093.ppops.net-00190b01. (8.18.1.11/8.18.1.11) with ESMTP id 5B3At5Tn3309304; Wed, 3 Dec 2025 18:51:28 GMT Received: from prod-mail-ppoint5 (prod-mail-ppoint5.akamai.com [184.51.33.60]) by m0050093.ppops.net-00190b01. (PPS) with ESMTPS id 4asw4c3scu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Dec 2025 18:51:28 +0000 (GMT) Received: from pps.filterd (prod-mail-ppoint5.akamai.com [127.0.0.1]) by prod-mail-ppoint5.akamai.com (8.18.1.2/8.18.1.2) with ESMTP id 5B3H6aDf010754; Wed, 3 Dec 2025 10:51:27 -0800 Received: from prod-mail-relay01.akamai.com ([172.27.118.31]) by prod-mail-ppoint5.akamai.com (PPS) with ESMTP id 4aqypdkm43-1; Wed, 03 Dec 2025 10:51:26 -0800 Received: from bos-lhvkhf.bos01.corp.akamai.com (bos-lhvkhf.bos01.corp.akamai.com [172.28.40.75]) by prod-mail-relay01.akamai.com (Postfix) with ESMTP id BB053A8; Wed, 3 Dec 2025 18:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akamai.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=jan2016.eng; bh=NID9cQ6TVR/7DxrIYOVpRG111sFYubPS/LHG9jXZ0ns=; b=BfT2Pa1BkoP/ d4RDQAubQafAKblmz2R4g0jm4eMvWZoAlsP/vtOhqAaXglss72i5io4hQRsBT+O/ 68kKqhaFzIlU6YgrZnViO55PPGrejZ1jJ/siZicKnyJ0sQpH9yxOmj9JhlkqtQ31 x05LZ91X/dU0AG3zPOt98mNFPf+RCxtS05OiCV3JR+kAZUPxlA7V4dkQxuBuG0dE mDNNEvyF7+kDpDs9DObAwrA5PtpRrxEPqsTgaggp1pV1KNNkUk6icGraJEEdjxsn RN/HamoDSxfSs/fCt9C85fOWVKRzmVxy05uoYe8mnPBryg+EWT9Dun7FRT5JNTSk W+RKpXKMQA== From: Ben Chaney Date: Wed, 03 Dec 2025 13:51:22 -0500 Subject: [PATCH v3 5/8] tap: common return label MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251203-cpr-tap-v3-5-3c12e0a61f8e@akamai.com> References: <20251203-cpr-tap-v3-0-3c12e0a61f8e@akamai.com> In-Reply-To: <20251203-cpr-tap-v3-0-3c12e0a61f8e@akamai.com> To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , "Michael S. Tsirkin" , Stefano Garzarella , Jason Wang , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Eric Blake , Markus Armbruster , Stefan Weil , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , Hamza Khan , Mark Kanda , Joshua Hunt , Max Tottenham , Ben Chaney , Steve Sistare X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764787886; l=5311; i=bchaney@akamai.com; s=20251203; h=from:subject:message-id; bh=C43PerSzdOjLbyjnfYhRXVpakesxZD1fRN+2JrhKpv0=; b=EMlxDsBd6GbwvzPIhmQMJg5iPXlg4CXwjoJi/ms+Om4vFMlOgnGy2BonMRVJxJov59QsrQ/to 4+opHPp/NC/AGZuaDKY1xEvW1dWw6JuaUxLUk/LQmlc1JzCksa2sg7z X-Developer-Key: i=bchaney@akamai.com; a=ed25519; pk=6+w9cse5QEeVdy3tjqFxs/4rAaRdQ2/fkTxVFq+lWy4= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-03_02,2025-12-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2510240000 definitions=main-2512030148 X-Proofpoint-ORIG-GUID: N4HEc5HaniSCw9t3f3932bso0dr4VFJD X-Proofpoint-GUID: N4HEc5HaniSCw9t3f3932bso0dr4VFJD X-Authority-Analysis: v=2.4 cv=Y+z1cxeN c=1 sm=1 tr=0 ts=693086b0 cx=c_pps a=NpDlK6FjLPvvy7XAFEyJFw==:117 a=NpDlK6FjLPvvy7XAFEyJFw==:17 a=IkcTkHD0fZMA:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=yPCof4ZbAAAA:8 a=X7Ea-ya5AAAA:8 a=zPeY32rCmRbJBjnbAY4A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjAzMDE0NyBTYWx0ZWRfX7LqgM8gBd742 1Zr2OmJlpvdVJBbhzIfJQexoHsRFYGEKWLb3GQYJ2ww68x6TSUawXv58T6R5ZqWzQlZHJaUjMIh +6fSB+QA01tPRnJ43v+XwXfUMe2joQwZb7tgjC7pwrBETw0LFHhuywv1fn/2mboY6RwnyfFDh+J xrQbalNISoEC4X2Zlk4FDHwby7yCM0mCSvKQ8wz9EUKNibxbZB4Ufi1+Hk5VhBKHOQNyO5FYfxK uoeX+5W9jr4J+9PNGn/eBOoQ1+OeYJWllvuwc+b7vjFEukpGRAQFHashTDshmcPQ9+VbLnHNeSJ hVPPUm7vRhnr96HFIstAQUHTRkIzPUcTe4cb4qx6gW6TeRZmn0enApWLCOYNbxRrevH9NXP28dF VeU3V88yI9mOTL0Jkj/EyfjV1Mo+Gg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-03_02,2025-12-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 phishscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512030147 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=2620:100:9001:583::1; envelope-from=bchaney@akamai.com; helo=mx0a-00190b01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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 @akamai.com) X-ZM-MESSAGEID: 1764787998566019200 From: Steve Sistare Modify net_init_tap so every return branches to a common label, for common cleanup in a subsequent patch. No functional change. Signed-off-by: Steve Sistare Signed-off-by: Ben Chaney --- net/tap.c | 55 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/net/tap.c b/net/tap.c index abe3b2d036..9d480574c3 100644 --- a/net/tap.c +++ b/net/tap.c @@ -830,7 +830,8 @@ int net_init_tap(const Netdev *netdev, const char *name, * For -netdev, peer is always NULL. */ if (peer && (tap->has_queues || tap->fds || tap->vhostfds)) { error_setg(errp, "Multiqueue tap cannot be used with hubs"); - return -1; + ret =3D -1; + goto out; } =20 if (tap->fd) { @@ -840,23 +841,27 @@ int net_init_tap(const Netdev *netdev, const char *na= me, 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; + ret =3D -1; + goto out; } =20 fd =3D monitor_fd_param(monitor_cur(), tap->fd, errp); if (fd =3D=3D -1) { - return -1; + ret =3D -1; + goto out; } =20 if (!qemu_set_blocking(fd, false, errp)) { close(fd); - return -1; + ret =3D -1; + goto out; } =20 vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { close(fd); - return -1; + ret =3D -1; + goto out; } =20 net_init_tap_one(tap, peer, "tap", name, NULL, @@ -865,7 +870,8 @@ int net_init_tap(const Netdev *netdev, const char *name, if (err) { error_propagate(errp, err); close(fd); - return -1; + ret =3D -1; + goto out; } } else if (tap->fds) { char **fds; @@ -878,7 +884,8 @@ int net_init_tap(const Netdev *netdev, const char *name, 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; + ret =3D -1; + goto out; } =20 fds =3D g_new0(char *, MAX_TAP_QUEUES); @@ -940,29 +947,35 @@ free_fail: } g_free(fds); g_free(vhost_fds); - return ret; + goto out; + } 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; + ret =3D -1; + goto out; } =20 fd =3D net_bridge_run_helper(tap->helper, tap->br ?: DEFAULT_BRIDGE_INTERFACE, errp); if (fd =3D=3D -1) { - return -1; + ret =3D -1; + goto out; } =20 if (!qemu_set_blocking(fd, false, errp)) { - return -1; + close(fd); + ret =3D -1; + goto out; } vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { close(fd); - return -1; + ret =3D -1; + goto out; } =20 net_init_tap_one(tap, peer, "bridge", name, ifname, @@ -971,14 +984,16 @@ free_fail: if (err) { error_propagate(errp, err); close(fd); - return -1; + ret =3D -1; + goto out; } } else { g_autofree char *default_script =3D NULL; g_autofree char *default_downscript =3D NULL; if (tap->vhostfds) { error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't spec= ified"); - return -1; + ret =3D -1; + goto out; } =20 if (!script) { @@ -999,14 +1014,16 @@ free_fail: fd =3D net_tap_init(tap, &vnet_hdr, i >=3D 1 ? "no" : script, ifname, sizeof ifname, queues > 1, errp); if (fd =3D=3D -1) { - return -1; + ret =3D -1; + goto out; } =20 if (queues > 1 && i =3D=3D 0 && !tap->ifname) { if (tap_fd_get_ifname(fd, ifname)) { error_setg(errp, "Fail to get ifname"); close(fd); - return -1; + ret =3D -1; + goto out; } } =20 @@ -1017,12 +1034,14 @@ free_fail: if (err) { error_propagate(errp, err); close(fd); - return -1; + ret =3D -1; + goto out; } } } =20 - return 0; +out: + return ret; } =20 int tap_enable(NetClientState *nc) --=20 2.34.1