From: Andreas Färber <afaerber@suse.de>
Date: Fri, 12 Oct 2012 02:23:05 +0000 (+0200)
Subject: sun4m: Pass SPARCCPU to cpu_kick_irq()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=38c66cf2817366fd56af7cd2099a696d715365ce;p=qmiga%2Fqemu.git

sun4m: 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>
---

diff --git a/hw/sun4m.c b/hw/sun4m.c
index c1ee8bd738..a04b485eda 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -253,8 +253,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);
@@ -268,7 +270,7 @@ static void cpu_set_irq(void *opaque, int irq, int level)
     if (level) {
         trace_sun4m_cpu_set_irq_raise(irq);
         env->pil_in |= 1 << irq;
-        cpu_kick_irq(env);
+        cpu_kick_irq(cpu);
     } else {
         trace_sun4m_cpu_set_irq_lower(irq);
         env->pil_in &= ~(1 << irq);