ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/arm/armv7m: Clean up local variable shadowing 

Fix:

  hw/arm/armv7m.c: In function ‘armv7m_realize’:
  hw/arm/armv7m.c:520:27: warning: declaration of ‘sbd’ shadows a previous local [-Wshadow=compatible-local]
    520 |             SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]);
        |                           ^~~
  hw/arm/armv7m.c:278:19: note: shadowed declaration is here
    278 |     SysBusDevice *sbd;
        |                   ^~~
       ---

  hw/arm/armsse.c: In function ‘armsse_realize’:
  hw/arm/armsse.c:1471:27: warning: declaration of ‘mr’ shadows a previous local [-Wshadow=compatible-local]
   1471 |             MemoryRegion *mr;
        |                           ^~
  hw/arm/armsse.c:917:19: note: shadowed declaration is here
    917 |     MemoryRegion *mr;
        |                   ^~
       ---

  hw/arm/armsse.c:1608:22: warning: declaration of ‘dev_splitter’ shadows a previous local [-Wshadow=compatible-local]
   1608 |         DeviceState *dev_splitter = DEVICE(splitter);
        |                      ^~~~~~~~~~~~
  hw/arm/armsse.c:923:18: note: shadowed declaration is here
    923 |     DeviceState *dev_splitter;
        |                  ^~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-8-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-09-04 18:12:19 +02:00 committed by Markus Armbruster
parent 81b8056a41
commit 807e4d1d21
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/arm/armsse.c
View File

@ -1468,7 +1468,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
if (info->has_cachectrl) { if (info->has_cachectrl) {
for (i = 0; i < info->num_cpus; i++) { for (i = 0; i < info->num_cpus; i++) {
char *name = g_strdup_printf("cachectrl%d", i); char *name = g_strdup_printf("cachectrl%d", i);
MemoryRegion *mr;
qdev_prop_set_string(DEVICE(&s->cachectrl[i]), "name", name); qdev_prop_set_string(DEVICE(&s->cachectrl[i]), "name", name);
g_free(name); g_free(name);
@ -1484,7 +1483,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
if (info->has_cpusecctrl) { if (info->has_cpusecctrl) {
for (i = 0; i < info->num_cpus; i++) { for (i = 0; i < info->num_cpus; i++) {
char *name = g_strdup_printf("CPUSECCTRL%d", i); char *name = g_strdup_printf("CPUSECCTRL%d", i);
MemoryRegion *mr;
qdev_prop_set_string(DEVICE(&s->cpusecctrl[i]), "name", name); qdev_prop_set_string(DEVICE(&s->cpusecctrl[i]), "name", name);
g_free(name); g_free(name);
@ -1499,7 +1497,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
} }
if (info->has_cpuid) { if (info->has_cpuid) {
for (i = 0; i < info->num_cpus; i++) { for (i = 0; i < info->num_cpus; i++) {
MemoryRegion *mr;
qdev_prop_set_uint32(DEVICE(&s->cpuid[i]), "CPUID", i); qdev_prop_set_uint32(DEVICE(&s->cpuid[i]), "CPUID", i);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpuid[i]), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpuid[i]), errp)) {
@ -1512,7 +1509,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
} }
if (info->has_cpu_pwrctrl) { if (info->has_cpu_pwrctrl) {
for (i = 0; i < info->num_cpus; i++) { for (i = 0; i < info->num_cpus; i++) {
MemoryRegion *mr;
if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpu_pwrctrl[i]), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpu_pwrctrl[i]), errp)) {
return; return;
@ -1605,7 +1601,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
/* Wire up the splitters for the MPC IRQs */ /* Wire up the splitters for the MPC IRQs */
for (i = 0; i < IOTS_NUM_EXP_MPC + info->sram_banks; i++) { for (i = 0; i < IOTS_NUM_EXP_MPC + info->sram_banks; i++) {
SplitIRQ *splitter = &s->mpc_irq_splitter[i]; SplitIRQ *splitter = &s->mpc_irq_splitter[i];
DeviceState *dev_splitter = DEVICE(splitter); DeviceState *devs = DEVICE(splitter);
if (!object_property_set_int(OBJECT(splitter), "num-lines", 2, if (!object_property_set_int(OBJECT(splitter), "num-lines", 2,
errp)) { errp)) {
@ -1617,22 +1613,22 @@ static void armsse_realize(DeviceState *dev, Error **errp)
if (i < IOTS_NUM_EXP_MPC) { if (i < IOTS_NUM_EXP_MPC) {
/* Splitter input is from GPIO input line */ /* Splitter input is from GPIO input line */
s->mpcexp_status_in[i] = qdev_get_gpio_in(dev_splitter, 0); s->mpcexp_status_in[i] = qdev_get_gpio_in(devs, 0);
qdev_connect_gpio_out(dev_splitter, 0, qdev_connect_gpio_out(devs, 0,
qdev_get_gpio_in_named(dev_secctl, qdev_get_gpio_in_named(dev_secctl,
"mpcexp_status", i)); "mpcexp_status", i));
} else { } else {
/* Splitter input is from our own MPC */ /* Splitter input is from our own MPC */
qdev_connect_gpio_out_named(DEVICE(&s->mpc[i - IOTS_NUM_EXP_MPC]), qdev_connect_gpio_out_named(DEVICE(&s->mpc[i - IOTS_NUM_EXP_MPC]),
"irq", 0, "irq", 0,
qdev_get_gpio_in(dev_splitter, 0)); qdev_get_gpio_in(devs, 0));
qdev_connect_gpio_out(dev_splitter, 0, qdev_connect_gpio_out(devs, 0,
qdev_get_gpio_in_named(dev_secctl, qdev_get_gpio_in_named(dev_secctl,
"mpc_status", "mpc_status",
i - IOTS_NUM_EXP_MPC)); i - IOTS_NUM_EXP_MPC));
} }
qdev_connect_gpio_out(dev_splitter, 1, qdev_connect_gpio_out(devs, 1,
qdev_get_gpio_in(DEVICE(&s->mpc_irq_orgate), i)); qdev_get_gpio_in(DEVICE(&s->mpc_irq_orgate), i));
} }
/* Create GPIO inputs which will pass the line state for our /* Create GPIO inputs which will pass the line state for our

2
hw/arm/armv7m.c
View File

@ -517,7 +517,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
for (i = 0; i < ARRAY_SIZE(s->bitband); i++) { for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
if (s->enable_bitband) { if (s->enable_bitband) {
Object *obj = OBJECT(&s->bitband[i]); Object *obj = OBJECT(&s->bitband[i]);
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]); sbd = SYS_BUS_DEVICE(&s->bitband[i]);
if (!object_property_set_int(obj, "base", if (!object_property_set_int(obj, "base",
bitband_input_addr[i], errp)) { bitband_input_addr[i], errp)) {