Patchwork [v2,2/5] sun4m: Pass SPARCCPU to cpu_kick_irq()

login
register
mail settings
Submitter Andreas Färber
Date Oct. 12, 2012, 2:23 a.m.
Message ID <1350008589-30711-3-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/191047/
State New
Headers show

Comments

Andreas Färber - Oct. 12, 2012, 2:23 a.m.
Needed for changing qemu_cpu_kick() argument type to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/sun4m.c |    6 ++++--
 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)

Patch

diff --git a/hw/sun4m.c b/hw/sun4m.c
index c1ee8bd..a04b485 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);