[5/6] hw/ppc/e500: Resolve variable shadowing

Commit Message

Bernhard Beschow Dec. 16, 2022, 2:57 p.m. UTC

Assign to the outer variable instead which even saves some code.

Signed-off-by: Bernhard Beschow <[e-mail]>
---
 hw/ppc/e500.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index ad83924004..104a85ad22 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -883,7 +883,7 @@  void ppce500_init(MachineState *machine)
     bool kernel_as_payload;
     hwaddr bios_entry = 0;
     target_long payload_size;
-    struct boot_info *boot_info;
+    struct boot_info *boot_info = NULL;
     int dt_size;
     int i;
     unsigned int smp_cpus = machine->smp.cpus;
@@ -938,7 +938,6 @@  void ppce500_init(MachineState *machine)
         /* Register reset handler */
         if (!i) {
             /* Primary CPU */
-            struct boot_info *boot_info;
             boot_info = g_new0(struct boot_info, 1);
             qemu_register_reset(ppce500_cpu_reset, cpu);
             env->load_info = boot_info;
@@ -1217,7 +1216,6 @@  void ppce500_init(MachineState *machine)
     }
     assert(dt_size < DTB_MAX_SIZE);
 
-    boot_info = env->load_info;
     boot_info->entry = bios_entry;
     boot_info->dt_base = dt_base;
     boot_info->dt_size = dt_size;