refactor(s8000): remove dynamic ARM_CPU casts

VisualEhrmanntraut · VisualEhrmanntraut · commit 16f5a2301b0d · 2026-02-24T21:54:49.000+02:00
diff --git a/hw/arm/apple-silicon/s8000.c b/hw/arm/apple-silicon/s8000.c
@@ -1391,7 +1391,7 @@ static void s8000_cpu_reset(AppleS8000MachineState *s8000)
                                     &error_abort);
             cpu_reset(cpu);
             if (acpu->cpu_id == 0) {
-                arm_set_cpu_on(ARM_CPU(acpu)->mp_affinity,
+                arm_set_cpu_on(acpu->parent_obj.mp_affinity,
                                s8000->boot_info.tz1_entry,
                                s8000->boot_info.tz1_boot_args_pa, 3, true);
             }
@@ -1400,7 +1400,7 @@ static void s8000_cpu_reset(AppleS8000MachineState *s8000)
                                     &error_abort);
             cpu_reset(cpu);
             if (acpu->cpu_id == 0) {
-                arm_set_cpu_on(ARM_CPU(acpu)->mp_affinity, SROM_BASE, 0, 3,
+                arm_set_cpu_on(acpu->parent_obj.mp_affinity, SROM_BASE, 0, 3,
                                true);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1391,7 +1391,7 @@ static void s8000_cpu_reset(AppleS8000MachineState *s8000)`
`1391`	`1391`	`&error_abort);`
`1392`	`1392`	`cpu_reset(cpu);`
`1393`	`1393`	`if (acpu->cpu_id == 0) {`
`1394`		`- arm_set_cpu_on(ARM_CPU(acpu)->mp_affinity,`
	`1394`	`+ arm_set_cpu_on(acpu->parent_obj.mp_affinity,`
`1395`	`1395`	`s8000->boot_info.tz1_entry,`
`1396`	`1396`	`s8000->boot_info.tz1_boot_args_pa, 3, true);`
`1397`	`1397`	`}`
`@@ -1400,7 +1400,7 @@ static void s8000_cpu_reset(AppleS8000MachineState *s8000)`
`1400`	`1400`	`&error_abort);`
`1401`	`1401`	`cpu_reset(cpu);`
`1402`	`1402`	`if (acpu->cpu_id == 0) {`
`1403`		`- arm_set_cpu_on(ARM_CPU(acpu)->mp_affinity, SROM_BASE, 0, 3,`
	`1403`	`+ arm_set_cpu_on(acpu->parent_obj.mp_affinity, SROM_BASE, 0, 3,`
`1404`	`1404`	`true);`
`1405`	`1405`	`}`
`1406`	`1406`	`}`