diff options
| author |   Andreas Färber <afaerber@suse.de> | 2012-10-12 04:23:07 +0200 |
|---|---|---|
| committer |   Blue Swirl <blauwirbel@gmail.com> | 2012-10-13 10:44:13 +0000 |
| commit | ce18c558f08ea392b2ec79046eb40e791be5fc88 (patch) | |
| tree | 6104d42871f13528f083b224910d6ea3dde27480 | |
| parent | 6b678e1f9b92e21ee2e2614440740ca76fc7d2d8 (diff) | |
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>
| -rw-r--r-- | hw/sun4u.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index 4cea102cb..045352277 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -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; cpu_check_irqs(env); qemu_cpu_kick(env); @@ -431,7 +433,7 @@ static void tick_irq(void *opaque) } env->softint |= SOFTINT_TIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } static void stick_irq(void *opaque) @@ -449,7 +451,7 @@ static void stick_irq(void *opaque) } env->softint |= SOFTINT_STIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } static void hstick_irq(void *opaque) @@ -467,7 +469,7 @@ static void hstick_irq(void *opaque) } 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) |