[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/22] hw/arm/aspeed: Clean up local variable shadowing
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 10/22] hw/arm/aspeed: Clean up local variable shadowing |
Date: |
Mon, 4 Sep 2023 18:12:22 +0200 |
Fix:
hw/arm/aspeed_ast2600.c:391:18: error: declaration shadows a local variable
[-Werror,-Wshadow]
qemu_irq irq = aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i);
^
hw/arm/aspeed_ast2600.c:283:14: note: previous declaration is here
qemu_irq irq;
^
hw/arm/aspeed_ast2600.c:416:18: error: declaration shadows a local variable
[-Werror,-Wshadow]
qemu_irq irq = qdev_get_gpio_in(DEVICE(&s->a7mpcore),
^
hw/arm/aspeed_ast2600.c:283:14: note: previous declaration is here
qemu_irq irq;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed_ast2600.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index a8b3a8065a..f54063445d 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -280,7 +280,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev,
Error **errp)
AspeedSoCState *s = ASPEED_SOC(dev);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
Error *err = NULL;
- qemu_irq irq;
g_autofree char *sram_name = NULL;
/* Default boot region (SPI memory or ROMs) */
@@ -339,6 +338,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev,
Error **errp)
for (i = 0; i < sc->num_cpus; i++) {
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->a7mpcore);
DeviceState *d = DEVICE(&s->cpu[i]);
+ qemu_irq irq;
irq = qdev_get_gpio_in(d, ARM_CPU_IRQ);
sysbus_connect_irq(sbd, i, irq);
--
2.41.0
- [PATCH v2 03/22] target/arm/hvf: Clean up local variable shadowing, (continued)
- [PATCH v2 03/22] target/arm/hvf: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 04/22] target/mips: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 05/22] target/m68k: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 06/22] target/tricore: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 07/22] hw/arm/armv7m: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 08/22] hw/arm/virt: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 09/22] hw/arm/allwinner: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 10/22] hw/arm/aspeed: Clean up local variable shadowing,
Philippe Mathieu-Daudé <=
- [PATCH v2 11/22] hw/ide/ahci: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 12/22] hw/m68k: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 13/22] hw/microblaze: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 14/22] hw/nios2: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 15/22] net/eth: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04
- [PATCH v2 16/22] crypto/cipher-gnutls.c: Clean up local variable shadowing, Philippe Mathieu-Daudé, 2023/09/04