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

sun4u: Pass SPARCCPU to cpu_kick_irq() 

Needed for changing qemu_cpu_kick() argument type to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Andreas Färber 2012-10-12 04:23:07 +02:00 committed by Blue Swirl
parent 6b678e1f9b
commit ce18c558f0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/sun4u.c
View File

@ -310,8 +310,10 @@ void cpu_check_irqs(CPUSPARCState *env)
} }
} }
static void cpu_kick_irq(CPUSPARCState *env) static void cpu_kick_irq(SPARCCPU *cpu)
{ {
CPUSPARCState *env = &cpu->env;
env->halted = 0; env->halted = 0;
cpu_check_irqs(env); cpu_check_irqs(env);
qemu_cpu_kick(env); qemu_cpu_kick(env);
@ -431,7 +433,7 @@ static void tick_irq(void *opaque)
} }
env->softint |= SOFTINT_TIMER; env->softint |= SOFTINT_TIMER;
cpu_kick_irq(env); cpu_kick_irq(cpu);
} }
static void stick_irq(void *opaque) static void stick_irq(void *opaque)
@ -449,7 +451,7 @@ static void stick_irq(void *opaque)
} }
env->softint |= SOFTINT_STIMER; env->softint |= SOFTINT_STIMER;
cpu_kick_irq(env); cpu_kick_irq(cpu);
} }
static void hstick_irq(void *opaque) static void hstick_irq(void *opaque)
@ -467,7 +469,7 @@ static void hstick_irq(void *opaque)
} }
env->softint |= SOFTINT_STIMER; env->softint |= SOFTINT_STIMER;
cpu_kick_irq(env); cpu_kick_irq(cpu);
} }
static int64_t cpu_to_timer_ticks(int64_t cpu_ticks, uint32_t frequency) static int64_t cpu_to_timer_ticks(int64_t cpu_ticks, uint32_t frequency)