qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Chris Wulff" <crwulff@gmail.com>, "Marek Vasut" <marex@denx.de>
Subject: [PATCH v2 14/22] hw/nios2: Clean up local variable shadowing
Date: Mon,  4 Sep 2023 18:12:26 +0200	[thread overview]
Message-ID: <20230904161235.84651-15-philmd@linaro.org> (raw)
In-Reply-To: <20230904161235.84651-1-philmd@linaro.org>

Fix:

  hw/nios2/10m50_devboard.c: In function ‘nios2_10m50_ghrd_init’:
  hw/nios2/10m50_devboard.c:101:22: warning: declaration of ‘dev’ shadows a previous local [-Wshadow=compatible-local]
    101 |         DeviceState *dev = qdev_new(TYPE_NIOS2_VIC);
        |                      ^~~
  hw/nios2/10m50_devboard.c:60:18: note: shadowed declaration is here
     60 |     DeviceState *dev;
        |                  ^~~

  hw/nios2/10m50_devboard.c:110:18: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
    110 |         for (int i = 0; i < 32; i++) {
        |                  ^
  hw/nios2/10m50_devboard.c:67:9: note: shadowed declaration is here
     67 |     int i;
        |         ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/nios2/10m50_devboard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 91383fb097..952a0dc33e 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -98,7 +98,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine)
     qdev_realize_and_unref(DEVICE(cpu), NULL, &error_fatal);
 
     if (nms->vic) {
-        DeviceState *dev = qdev_new(TYPE_NIOS2_VIC);
+        dev = qdev_new(TYPE_NIOS2_VIC);
         MemoryRegion *dev_mr;
         qemu_irq cpu_irq;
 
@@ -107,7 +107,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine)
 
         cpu_irq = qdev_get_gpio_in_named(DEVICE(cpu), "EIC", 0);
         sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq);
-        for (int i = 0; i < 32; i++) {
+        for (i = 0; i < 32; i++) {
             irq[i] = qdev_get_gpio_in(dev, i);
         }
 
-- 
2.41.0



  parent reply	other threads:[~2023-09-04 16:18 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-04 16:12 [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 01/22] tcg: Clean up local variable shadowing Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 02/22] target/arm/tcg: " Philippe Mathieu-Daudé
2023-09-08 12:25   ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 03/22] target/arm/hvf: " Philippe Mathieu-Daudé
2023-09-08 12:26   ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 04/22] target/mips: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 05/22] target/m68k: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 06/22] target/tricore: " Philippe Mathieu-Daudé
2023-09-05  5:34   ` Bastian Koppelmann
2023-09-04 16:12 ` [PATCH v2 07/22] hw/arm/armv7m: " Philippe Mathieu-Daudé
2023-09-08 12:29   ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 08/22] hw/arm/virt: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 09/22] hw/arm/allwinner: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 10/22] hw/arm/aspeed: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 11/22] hw/ide/ahci: " Philippe Mathieu-Daudé
2023-09-29  5:07   ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 12/22] hw/m68k: " Philippe Mathieu-Daudé
2023-09-26 16:28   ` Thomas Huth
2023-09-04 16:12 ` [PATCH v2 13/22] hw/microblaze: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` Philippe Mathieu-Daudé [this message]
2023-09-04 16:12 ` [PATCH v2 15/22] net/eth: " Philippe Mathieu-Daudé
2023-09-08 13:18   ` Eric Blake
2023-09-10  4:20   ` Akihiko Odaki
2023-09-04 16:12 ` [PATCH v2 16/22] crypto/cipher-gnutls.c: " Philippe Mathieu-Daudé
2023-09-04 16:27   ` Daniel P. Berrangé
2023-09-04 16:29     ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 17/22] util/vhost-user-server: " Philippe Mathieu-Daudé
2023-09-22 10:23   ` Michael S. Tsirkin
2023-09-04 16:12 ` [PATCH v2 18/22] semihosting/arm-compat: " Philippe Mathieu-Daudé
2023-09-08 12:36   ` Peter Maydell
2023-10-04  9:41     ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 19/22] linux-user/strace: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 20/22] sysemu/device_tree: " Philippe Mathieu-Daudé
2023-09-29  4:58   ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 21/22] softmmu/memory: " Philippe Mathieu-Daudé
2023-09-05 15:46   ` Peter Xu
2023-09-04 16:12 ` [RFC PATCH v2 22/22] softmmu/physmem: " Philippe Mathieu-Daudé
2023-09-04 16:31   ` Daniel P. Berrangé
2023-09-05 15:50     ` Peter Xu
2023-09-29  5:13 ` [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Markus Armbruster
2023-09-29  6:42   ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230904161235.84651-15-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=armbru@redhat.com \
    --cc=crwulff@gmail.com \
    --cc=marex@denx.de \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).