From nobody Sun Sep 28 17:48:15 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=1757609515; cv=none; d=zohomail.com; s=zohoarc; b=WsQGGi8/IopQFeZkjf3HRnPNCOnGYukShVnSbjjBwnGqmAbLFn0mr1XpClSg89SvKUO8rNhAiQDdK7ZviVbymNC30TtbZNh3ZkOYueVdzGJd29jTvHVOBVbl5Qsk9A5qokoOCV2CJp5j+S6zwX986uEBM4m8DoP0HKPLtE1JSZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757609515; 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=eJ3HD6jryrgptt1wCimqF9otPGpP21C0gDC98NJaLv0=; b=eVE2aYoarox9SY70IJIS2k8hzUbTyaRnOnUhsIuesHwy1+4qnWbGBMXO7h3XeXveeqKJnm3heIrgWg9QmQhRF/q0DybXK+CWgHEzyVt48royIm0lyFJ4atjKqSj2XrKnBg7rtqBEtr/6APpEZN77GzchnPp0mWFYYfmVwjCpG3M= 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 1757609515636587.4354193384568; Thu, 11 Sep 2025 09:51:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uwkW1-00037z-Le; Thu, 11 Sep 2025 12:51:21 -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 1uwkVv-0002t3-5n for qemu-devel@nongnu.org; Thu, 11 Sep 2025 12:51:15 -0400 Received: from forwardcorp1d.mail.yandex.net ([2a02:6b8:c41:1300: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 1uwkVr-0004As-DO for qemu-devel@nongnu.org; Thu, 11 Sep 2025 12:51:14 -0400 Received: from mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:94a9:0:640:a3fa:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 925BA807B0; Thu, 11 Sep 2025 19:51:08 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b3c::1:2f]) by mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 2pOVKM0Fka60-aFGvYJGI; Thu, 11 Sep 2025 19:51:08 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1757609468; bh=eJ3HD6jryrgptt1wCimqF9otPGpP21C0gDC98NJaLv0=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=lmcr2AUyOSDfB4HYuk/PbC6Jwa1GQ7v+TDLxmgLA5zAytbKd+yNr22BsGvifIUfcK xbvPzJZMPImZVBmMmbEkVhtJ3sj3VpzySU1nV20xfmHOX0xUtRWimf9/08zx7QB347 uybLFaKDoLDOTBhOGmRkq6iLwOfNxud9kQ7wPl6U= Authentication-Results: mail-nwsmtp-smtp-corp-main-68.klg.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, davydov-max@yandex-team.ru Subject: [PATCH v4 8/8] net/tap: move local variables related to the latter case to else branch Date: Thu, 11 Sep 2025 19:51:01 +0300 Message-ID: <20250911165101.1637608-9-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250911165101.1637608-1-vsementsov@yandex-team.ru> References: <20250911165101.1637608-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:c41:1300:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.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: 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: 1757609517970116600 Content-Type: text/plain; charset="utf-8" This makes more obvious, where the variables make sense. Note that ifname, script and downscript variables are not used in net_init_tap_one() for fd/fds/helper cases. Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/net/tap.c b/net/tap.c index 70ebe0c752..ce090582e0 100644 --- a/net/tap.c +++ b/net/tap.c @@ -801,19 +801,11 @@ static int get_fds(char *str, char *fds[], int max) int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { - const NetdevTapOptions *tap; - int fd, vnet_hdr =3D 0, i =3D 0, queues; - /* for the no-fd, no-helper case */ - const char *script; - const char *downscript; - char ifname[128]; + const NetdevTapOptions *tap =3D &netdev->u.tap; + int fd, vnet_hdr =3D 0, i =3D 0; int ret =3D 0; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); - tap =3D &netdev->u.tap; - queues =3D tap->has_queues ? tap->queues : 1; - script =3D tap->script; - downscript =3D tap->downscript; =20 /* QEMU hubs do not support multiqueue tap, in this case peer is set. * For -netdev, peer is always NULL. */ @@ -861,7 +853,7 @@ int net_init_tap(const Netdev *netdev, const char *name, } =20 if (!net_init_tap_one(tap, peer, "tap", name, NULL, - script, downscript, + NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp)) { return -1; } @@ -916,8 +908,8 @@ int net_init_tap(const Netdev *netdev, const char *name, goto free_fail; } =20 - if (!net_init_tap_one(tap, peer, "tap", name, ifname, - script, downscript, + if (!net_init_tap_one(tap, peer, "tap", name, NULL, + NULL, NULL, tap->vhostfds ? vhost_fds[i] : NULL, vnet_hdr, fd, errp)) { ret =3D -1; @@ -958,15 +950,20 @@ free_fail: return -1; } =20 - if (!net_init_tap_one(tap, peer, "bridge", name, ifname, - script, downscript, tap->vhostfd, + if (!net_init_tap_one(tap, peer, "bridge", name, NULL, + NULL, NULL, tap->vhostfd, vnet_hdr, fd, errp)) { close(fd); return -1; } } else { + const char *script =3D tap->script; + const char *downscript =3D tap->downscript; + int queues =3D tap->has_queues ? tap->queues : 1; g_autofree char *default_script =3D NULL; g_autofree char *default_downscript =3D NULL; + char ifname[128]; + if (tap->vhostfds) { error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't spec= ified"); return -1; --=20 2.48.1