mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-29 05:13:54 -06:00
hw/hppa: Reset vCPUs calling resettable_reset()
Rather than manually (and incompletely) resetting vCPUs, call resettable_reset() which will fully reset the vCPUs. Remove redundant assignations. Signed-off-by: Helge Deller <deller@gmx.de> Co-developed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20241231190620.24442-4-philmd@linaro.org>
This commit is contained in:
parent
f4f4173188
commit
20f7b89017
2 changed files with 4 additions and 3 deletions
|
@ -655,12 +655,12 @@ static void hppa_machine_reset(MachineState *ms, ResetType type)
|
||||||
for (i = 0; i < smp_cpus; i++) {
|
for (i = 0; i < smp_cpus; i++) {
|
||||||
CPUState *cs = CPU(cpu[i]);
|
CPUState *cs = CPU(cpu[i]);
|
||||||
|
|
||||||
|
/* reset CPU */
|
||||||
|
resettable_reset(OBJECT(cs), RESET_TYPE_COLD);
|
||||||
|
|
||||||
cpu_set_pc(cs, firmware_entry);
|
cpu_set_pc(cs, firmware_entry);
|
||||||
cpu[i]->env.psw = PSW_Q;
|
cpu[i]->env.psw = PSW_Q;
|
||||||
cpu[i]->env.gr[5] = CPU_HPA + i * 0x1000;
|
cpu[i]->env.gr[5] = CPU_HPA + i * 0x1000;
|
||||||
|
|
||||||
cs->exception_index = -1;
|
|
||||||
cs->halted = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* already initialized by machine_hppa_init()? */
|
/* already initialized by machine_hppa_init()? */
|
||||||
|
|
|
@ -204,6 +204,7 @@ static void hppa_cpu_reset_hold(Object *obj, ResetType type)
|
||||||
scc->parent_phases.hold(obj, type);
|
scc->parent_phases.hold(obj, type);
|
||||||
}
|
}
|
||||||
cs->exception_index = -1;
|
cs->exception_index = -1;
|
||||||
|
cs->halted = 0;
|
||||||
|
|
||||||
memset(env, 0, offsetof(CPUHPPAState, end_reset_fields));
|
memset(env, 0, offsetof(CPUHPPAState, end_reset_fields));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue