Re: [PATCH 07/11] hw/arm/aspeed: Clean up local variable shadowing

2023-08-31 Thread Cédric Le Goater 

On 9/1/23 00:56, Philippe Mathieu-Daudé wrote:

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(>a7mpcore),
  ^
   hw/arm/aspeed_ast2600.c:283:14: note: previous declaration is here
 qemu_irq irq;
  ^

Signed-off-by: Philippe Mathieu-Daudé 



Reviewed-by: Cédric Le Goater 

Thanks,

C.



---
  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(>a7mpcore);
  DeviceState  *d   = DEVICE(>cpu[i]);
+qemu_irq irq;
  
  irq = qdev_get_gpio_in(d, ARM_CPU_IRQ);

  sysbus_connect_irq(sbd, i, irq);

[PATCH 07/11] hw/arm/aspeed: Clean up local variable shadowing

2023-08-31 Thread Philippe Mathieu-Daudé 
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(>a7mpcore),
 ^
  hw/arm/aspeed_ast2600.c:283:14: note: previous declaration is here
qemu_irq irq;
 ^

Signed-off-by: Philippe Mathieu-Daudé 
---
 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(>a7mpcore);
 DeviceState  *d   = DEVICE(>cpu[i]);
+qemu_irq irq;
 
 irq = qdev_get_gpio_in(d, ARM_CPU_IRQ);
 sysbus_connect_irq(sbd, i, irq);
-- 
2.41.0