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

sun4m: Pass SPARCCPU to {main,secondary}_cpu_reset() 

We can now use cpu_reset() in place of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Andreas Färber 2012-05-03 03:21:31 +02:00
parent 8968f588e3
commit 5414dec635
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/sun4m.c
View File

@ -281,17 +281,19 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level)
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
CPUSPARCState *env = opaque; SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
cpu_state_reset(env); cpu_reset(CPU(cpu));
env->halted = 0; env->halted = 0;
} }
static void secondary_cpu_reset(void *opaque) static void secondary_cpu_reset(void *opaque)
{ {
CPUSPARCState *env = opaque; SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
cpu_state_reset(env); cpu_reset(CPU(cpu));
env->halted = 1; env->halted = 1;
} }
@ -821,9 +823,9 @@ static void cpu_devinit(const char *cpu_model, unsigned int id,
cpu_sparc_set_id(env, id); cpu_sparc_set_id(env, id);
if (id == 0) { if (id == 0) {
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, cpu);
} else { } else {
qemu_register_reset(secondary_cpu_reset, env); qemu_register_reset(secondary_cpu_reset, cpu);
env->halted = 1; env->halted = 1;
} }
*cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS);