From patchwork Fri Sep 22 15:29:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 725225 Delivered-To: patch@linaro.org Received: by 2002:adf:ea87:0:b0:31d:da82:a3b4 with SMTP id s7csp1092798wrm; Fri, 22 Sep 2023 08:30:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHH3dhkTJaO+TGB2Uyv86JABdeLIk7GYBuqWctpiXbqCSSi0EPxLuNJD5MuRCpuopIzgzIt X-Received: by 2002:a67:d08d:0:b0:452:6178:642c with SMTP id s13-20020a67d08d000000b004526178642cmr8419300vsi.1.1695396623380; Fri, 22 Sep 2023 08:30:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695396623; cv=none; d=google.com; s=arc-20160816; b=jsxmD6x0y/aVvpaqMj2GS7d9hEM6eqHCRnFoChH+nfeuH+Qdm9dnxgF75kQHF1ESah oRzi+TvxE3hbHMuToFmXo+Z0S1JX+cmD7w6CAmuGmCuOXmN5oRN3BXOoAehIJMTHROvD H6f6G40Ro566l9Tg7AG0AfRckHfTevfzvi7Ky+kVj9QBEMhT5kW6duym/sCwcZto36Vi IKXciGzx1nTK4olp6e5I22mGMdgZElokpAaS8Z3H229e7iLWvPnJqMCh8WgR/5yhpC4g DBCy1AybXPjtPu/qhLyr9H50mh2BnRuG9sLU1DISE/oS4ZJxNHM53ge6DkxzBnL2bKTK W8mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=O4Ow+VsK9jJEZHPQsnuiyJ0dMqoukmN8lv7f9IShQS8=; fh=uVBMvYrx+X7m1lFjfWwA+UgXnF+hI4+JyNcPtFqOEwM=; b=1Da2938DScAlcYxml0s8tlPlPovd1jUV+TITiI8MpG6PI9xjLn26tC0oHmJ4wvHUq2 KgdRKoyOPIP1nlAt6ge4B+B4zS4sCUuHKfz60LJyP1g1tsMBlIIC4ryhv0/whZo7EIr9 6Br4Ba5r+MCfbmnXwlGgB4L5kADe4bYsHerA4hVjrGZOj3qJ3cSQwnIw5BcIQlOXLgTS b6Q6hXKexO9Hd2o4UdAffBqx4rcqnPntJAgcteQuv0Y/DBAmm+XamdX95HTHf5TBfM1g 8w8awgMUA2KRYzBS6jv4wvrNLedtadW0MC/JLL4Vhy6OaTEcx62uJjHtsdAJ7kzf8eGY CUAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OvwVqymK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bp34-20020a05620a45a200b0076841c3ee40si2467966qkb.598.2023.09.22.08.30.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Sep 2023 08:30:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OvwVqymK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qji6R-0005Ln-6d; Fri, 22 Sep 2023 11:30:00 -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 1qji6K-0005Ha-Ai for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:29:52 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qji6I-00007J-B3 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:29:52 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-401187f8071so18009525e9.0 for ; Fri, 22 Sep 2023 08:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695396588; x=1696001388; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O4Ow+VsK9jJEZHPQsnuiyJ0dMqoukmN8lv7f9IShQS8=; b=OvwVqymKoRFGIYQj3RADNy+xsmWGjO2CxbPpdrd7Lvc7GSW1g7b7+GxEI5oeSJOhD2 MhfSefCkfNOX4F8V6Xhmh99E7vVl8Ujt3TxbWD/HgzWMjLgIt9uJWBn3vaK//ArlxveQ 4+EZxBju9eQhQKhGp6QBlnqKjPMoWvapQAnT5N8eBNTR2mVUFKyG7psHHpaCCBKSONKR eIDIXrjHt/LZ/9AhdkeEk3YzepwiW1B2F06BOZEnKo2XcTL2nJCpdfS4DyBpJBVGT2NL 8QYxLdeOmLIa0xk43CH517gwPp+tZEQ/wMYpodFsBUXhxmPo8Di12fMkoGFcT+tM+BxV 0dkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695396588; x=1696001388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O4Ow+VsK9jJEZHPQsnuiyJ0dMqoukmN8lv7f9IShQS8=; b=h9WkdNnDUVmhACFkgDn0t2qqnWQLcmgDCjoLpPkseySljyrGDBZnPrNAeDQG25sRXn uFVmrhL3cGe/AXJiMbuUXHQkEYz2t9zjm81gDPWkVEYt5H58UK1IapYryCd63Y3bmwid ix7y3to/ZswMXzNgF+Q4Dx1+INCEFiKK7V0ix1n4eEx0crkdTw6FxUta22Fi42jT3W4f YZGte0qJb7TfPm3oepFJY1Cskk+0c2OUqkrc+eIY7r9bDQepMAqbQhbMSpio4pDTp2iX 6+QNqd3HpnOokujLg3XJbADRIk1rEHz/tNmQo4Jo8V9mfLOcFzibZc0oAF1jjyCnWY/S Lpkw== X-Gm-Message-State: AOJu0YzsvCnITSyIeX6yzg3eWsda64JXYmVFxRoq6d06pXiGfupfc2dL KeXuRNqTIWQdXTtDWFCC5x6Fdw== X-Received: by 2002:a1c:6a1a:0:b0:403:c70b:b688 with SMTP id f26-20020a1c6a1a000000b00403c70bb688mr33263wmc.6.1695396588688; Fri, 22 Sep 2023 08:29:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c22-20020a05600c171600b00405442edc69sm777137wmn.14.2023.09.22.08.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:29:48 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Eric Auger , Markus Armbruster Subject: [PATCH 1/4] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd() Date: Fri, 22 Sep 2023 16:29:41 +0100 Message-Id: <20230922152944.3583438-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230922152944.3583438-1-peter.maydell@linaro.org> References: <20230922152944.3583438-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com 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 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Avoid shadowing a local variable in do_process_its_cmd(): ../../hw/intc/arm_gicv3_its.c:548:17: warning: declaration of ‘ite’ shadows a previous local [-Wshadow=compatible-local] 548 | ITEntry ite = {}; | ^~~ ../../hw/intc/arm_gicv3_its.c:518:13: note: shadowed declaration is here 518 | ITEntry ite; | ^~~ Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger --- hw/intc/arm_gicv3_its.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 5f552b4d37f..52e9aca9c65 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -545,10 +545,10 @@ static ItsCmdResult do_process_its_cmd(GICv3ITSState *s, uint32_t devid, } if (cmdres == CMD_CONTINUE_OK && cmd == DISCARD) { - ITEntry ite = {}; + ITEntry i = {}; /* remove mapping from interrupt translation table */ - ite.valid = false; - return update_ite(s, eventid, &dte, &ite) ? CMD_CONTINUE_OK : CMD_STALL; + i.valid = false; + return update_ite(s, eventid, &dte, &i) ? CMD_CONTINUE_OK : CMD_STALL; } return CMD_CONTINUE_OK; }