| Message ID | 20230831225607.30829-6-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | (few more) Steps towards enabling -Wshadow | expand |
On Thu, 31 Aug 2023 at 23:56, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > Fix: > > hw/arm/virt.c:821:22: error: declaration shadows a local variable [-Werror,-Wshadow] > qemu_irq irq = qdev_get_gpio_in(vms->gic, > ^ > hw/arm/virt.c:803:13: note: previous declaration is here > int irq; > ^ > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a13c658bbf..32a964b572 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -800,7 +800,6 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) for (i = 0; i < smp_cpus; i++) { DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; - int irq; /* Mapping from the output timer irq lines from the CPU to the * GIC PPI inputs we use for the virt board. */ @@ -811,7 +810,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) [GTIMER_SEC] = ARCH_TIMER_S_EL1_IRQ, }; - for (irq = 0; irq < ARRAY_SIZE(timer_irq); irq++) { + for (unsigned irq = 0; irq < ARRAY_SIZE(timer_irq); irq++) { qdev_connect_gpio_out(cpudev, irq, qdev_get_gpio_in(vms->gic, ppibase + timer_irq[irq]));
Fix: hw/arm/virt.c:821:22: error: declaration shadows a local variable [-Werror,-Wshadow] qemu_irq irq = qdev_get_gpio_in(vms->gic, ^ hw/arm/virt.c:803:13: note: previous declaration is here int irq; ^ Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/arm/virt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)