sun4u: Pass SPARCCPU to cpu_kick_irq()

Needed for changing qemu_cpu_kick() argument type to CPUState.

Signed-off-by: Andreas Färber <[email protected]>
Signed-off-by: Blue Swirl <[email protected]>

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 4cea102cb3cb3184172ecd1fdb3dd73e65544760..045352277e66f22fc0c4e2c128d620c3a0defb06 100644 (file)
--- 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);
     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;
     }
 
     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)