On 1/9/26 01:34, Alex Bennée wrote:
@@ -129,8 +122,8 @@ static void virt_init(MachineState *machine)
      SysBusDevice *sysbus;
      hwaddr io_base;
      int i;
-    ResetInfo *reset_info;
      uint8_t rng_seed[32];
+    CPUM68KState *env;
if (ram_size > 3399672 * KiB) {
          /*
@@ -142,13 +135,10 @@ static void virt_init(MachineState *machine)
          exit(1);
      }
- reset_info = g_new0(ResetInfo, 1);
-
      /* init CPUs */
      cpu = M68K_CPU(cpu_create(machine->cpu_type));
-
-    reset_info->cpu = cpu;
-    qemu_register_reset(main_cpu_reset, reset_info);
+    qemu_register_reset(main_cpu_reset, cpu);
+    env = &cpu->env;
/* RAM */
      memory_region_add_subregion(get_system_memory(), 0, machine->ram);
@@ -235,7 +225,7 @@ static void virt_init(MachineState *machine)
              error_report("could not load kernel '%s'", kernel_filename);
              exit(1);
          }
-        reset_info->initial_pc = elf_entry;
+        env->reset_pc = elf_entry;
          parameters_base = (high + 1) & ~1;
          param_ptr = param_blob;

Why introduce env rather than use cpu->env like elsewhere in the function?

Otherwise,
Reviewed-by: Richard Henderson <[email protected]>


r~

Reply via email to