qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@redhat.com, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PULL 16/56] hw/arm/allwinner: Clean up local variable shadowing
Date: Fri, 29 Sep 2023 10:50:13 +0200	[thread overview]
Message-ID: <20230929085053.2789105-17-armbru@redhat.com> (raw)
In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Fix:

  hw/arm/allwinner-r40.c:412:14: error: declaration shadows a local variable [-Werror,-Wshadow]
    for (int i = 0; i < AW_R40_NUM_MMCS; i++) {
             ^
  hw/arm/allwinner-r40.c:299:14: note: previous declaration is here
    unsigned i;
             ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230904161235.84651-10-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/arm/allwinner-r40.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index 7d29eb224f..a0d367c60d 100644
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -296,10 +296,9 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
 {
     const char *r40_nic_models[] = { "gmac", "emac", NULL };
     AwR40State *s = AW_R40(dev);
-    unsigned i;
 
     /* CPUs */
-    for (i = 0; i < AW_R40_NUM_CPUS; i++) {
+    for (unsigned i = 0; i < AW_R40_NUM_CPUS; i++) {
 
         /*
          * Disable secondary CPUs. Guest EL3 firmware will start
@@ -335,7 +334,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
      * maintenance interrupt signal to the appropriate GIC PPI inputs,
      * and the GIC's IRQ/FIQ/VIRQ/VFIQ interrupt outputs to the CPU's inputs.
      */
-    for (i = 0; i < AW_R40_NUM_CPUS; i++) {
+    for (unsigned i = 0; i < AW_R40_NUM_CPUS; i++) {
         DeviceState *cpudev = DEVICE(&s->cpus[i]);
         int ppibase = AW_R40_GIC_NUM_SPI + i * GIC_INTERNAL + GIC_NR_SGIS;
         int irq;
@@ -494,7 +493,7 @@ static void allwinner_r40_realize(DeviceState *dev, Error **errp)
                        qdev_get_gpio_in(DEVICE(&s->gic), AW_R40_GIC_SPI_EMAC));
 
     /* Unimplemented devices */
-    for (i = 0; i < ARRAY_SIZE(r40_unimplemented); i++) {
+    for (unsigned i = 0; i < ARRAY_SIZE(r40_unimplemented); i++) {
         create_unimplemented_device(r40_unimplemented[i].device_name,
                                     r40_unimplemented[i].base,
                                     r40_unimplemented[i].size);
-- 
2.41.0



  parent reply	other threads:[~2023-09-29  8:58 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-29  8:49 [PULL 00/56] -Wshadow=local patches patches for 2023-09-29 Markus Armbruster
2023-09-29  8:49 ` [PULL 01/56] migration/rdma: Fix save_page method to fail on polling error Markus Armbruster
2023-09-29  8:49 ` [PULL 02/56] migration: Clean up local variable shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 03/56] ui: " Markus Armbruster
2023-09-29  8:50 ` [PULL 04/56] block/dirty-bitmap: " Markus Armbruster
2023-09-29  8:50 ` [PULL 05/56] block/vdi: " Markus Armbruster
2023-09-29  8:50 ` [PULL 06/56] block: " Markus Armbruster
2023-09-29  8:50 ` [PULL 07/56] qobject atomics osdep: Make a few macros more hygienic Markus Armbruster
2023-09-29  8:50 ` [PULL 08/56] tcg: Clean up local variable shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 09/56] target/arm/tcg: " Markus Armbruster
2023-09-29  8:50 ` [PULL 10/56] target/arm/hvf: " Markus Armbruster
2023-09-29  8:50 ` [PULL 11/56] target/mips: " Markus Armbruster
2023-09-29  8:50 ` [PULL 12/56] target/m68k: " Markus Armbruster
2023-09-29  8:50 ` [PULL 13/56] target/tricore: " Markus Armbruster
2023-09-29  8:50 ` [PULL 14/56] hw/arm/armv7m: " Markus Armbruster
2023-09-29  8:50 ` [PULL 15/56] hw/arm/virt: " Markus Armbruster
2023-09-29  8:50 ` Markus Armbruster [this message]
2023-09-29  8:50 ` [PULL 17/56] hw/m68k: " Markus Armbruster
2023-09-29  8:50 ` [PULL 18/56] hw/microblaze: " Markus Armbruster
2023-09-29  8:50 ` [PULL 19/56] hw/nios2: " Markus Armbruster
2023-09-29  8:50 ` [PULL 20/56] net/eth: " Markus Armbruster
2023-09-29  8:50 ` [PULL 21/56] crypto/cipher-gnutls.c: " Markus Armbruster
2023-09-29  8:50 ` [PULL 22/56] util/vhost-user-server: " Markus Armbruster
2023-09-29  8:50 ` [PULL 23/56] linux-user/strace: " Markus Armbruster
2023-09-29  8:50 ` [PULL 24/56] sysemu/device_tree: " Markus Armbruster
2023-09-29  8:50 ` [PULL 25/56] softmmu/memory: " Markus Armbruster
2023-09-29  8:50 ` [PULL 26/56] softmmu/physmem: " Markus Armbruster
2023-09-29  8:50 ` [PULL 27/56] hw/core/machine: " Markus Armbruster
2023-09-29  8:50 ` [PULL 28/56] hw/intc/openpic: " Markus Armbruster
2023-09-29  8:50 ` [PULL 29/56] hw/ppc: Clean up local variable shadowing in _FDT helper routine Markus Armbruster
2023-09-29  8:50 ` [PULL 30/56] pnv/psi: Clean up local variable shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 31/56] spapr: Clean up local variable shadowing in spapr_dt_cpus() Markus Armbruster
2023-09-29  8:50 ` [PULL 32/56] spapr: Clean up local variable shadowing in spapr_init_cpus() Markus Armbruster
2023-09-29  8:50 ` [PULL 33/56] spapr: Clean up local variable shadowing in spapr_get_fw_dev_path() Markus Armbruster
2023-09-29  8:50 ` [PULL 34/56] spapr/drc: Clean up local variable shadowing in rtas_ibm_configure_connector() Markus Armbruster
2023-09-29  8:50 ` [PULL 35/56] spapr/pci: Clean up local variable shadowing in spapr_phb_realize() Markus Armbruster
2023-09-29  8:50 ` [PULL 36/56] spapr/drc: Clean up local variable shadowing in prop_get_fdt() Markus Armbruster
2023-09-29  8:50 ` [PULL 37/56] test-throttle: don't shadow 'index' variable in do_test_accounting() Markus Armbruster
2023-09-29  8:50 ` [PULL 38/56] hw/acpi: changes towards enabling -Wshadow=local Markus Armbruster
2023-09-30  3:54   ` Ani Sinha
2023-09-30  8:41     ` Markus Armbruster
2023-10-02 10:49       ` Michael S. Tsirkin
2023-09-29  8:50 ` [PULL 39/56] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd() Markus Armbruster
2023-09-29  8:50 ` [PULL 40/56] hw/misc/arm_sysctl.c: Avoid shadowing local variable Markus Armbruster
2023-09-29  8:50 ` [PULL 41/56] hw/arm/smmuv3.c: Avoid shadowing variable Markus Armbruster
2023-09-29  8:50 ` [PULL 42/56] hw/arm/smmuv3-internal.h: Don't use locals in statement macros Markus Armbruster
2023-09-29  8:50 ` [PULL 43/56] aspeed/i2c: Clean up local variable shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 44/56] aspeed: " Markus Armbruster
2023-09-29  8:50 ` [PULL 45/56] aspeed/i3c: Rename variable shadowing a local Markus Armbruster
2023-09-29  8:50 ` [PULL 46/56] aspeed/timer: Clean up local variable shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 47/56] intel_iommu: Fix shadow local variables on "size" Markus Armbruster
2023-09-29  8:50 ` [PULL 48/56] crypto: remove shadowed 'ret' variable Markus Armbruster
2023-09-29  8:50 ` [PULL 49/56] seccomp: avoid shadowing of 'action' variable Markus Armbruster
2023-09-29  8:50 ` [PULL 50/56] qemu-nbd: changes towards enabling -Wshadow=local Markus Armbruster
2023-09-29  8:50 ` [PULL 51/56] hw/riscv: opentitan: Fixup local variables shadowing Markus Armbruster
2023-09-29  8:50 ` [PULL 52/56] target/riscv: cpu: " Markus Armbruster
2023-09-29  8:50 ` [PULL 53/56] target/riscv: vector_helper: " Markus Armbruster
2023-09-29  8:50 ` [PULL 54/56] softmmu/device_tree: " Markus Armbruster
2023-09-29  8:50 ` [PULL 55/56] hw/nvme: Clean up local variable shadowing in nvme_ns_init() Markus Armbruster
2023-09-29  8:50 ` [PULL 56/56] disas/m68k: clean up local variable shadowing Markus Armbruster
2023-10-02 21:57 ` [PULL 00/56] -Wshadow=local patches patches for 2023-09-29 Stefan Hajnoczi

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=20230929085053.2789105-17-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).