From e0bbf9b573e1a19a906abef861ee28293e44b3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 12 Oct 2012 04:23:04 +0200 Subject: sun4m: Pass SPARCCPU to cpu_set_irq() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed for changing cpu_kick_irq() argument type to SPARCCPU. Signed-off-by: Andreas Färber Signed-off-by: Blue Swirl --- hw/sun4m.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index c98cd5ec3f..c1ee8bd738 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -262,7 +262,8 @@ static void cpu_kick_irq(CPUSPARCState *env) static void cpu_set_irq(void *opaque, int irq, int level) { - CPUSPARCState *env = opaque; + SPARCCPU *cpu = opaque; + CPUSPARCState *env = &cpu->env; if (level) { trace_sun4m_cpu_set_irq_raise(irq); @@ -840,7 +841,7 @@ static void cpu_devinit(const char *cpu_model, unsigned int id, qemu_register_reset(secondary_cpu_reset, cpu); env->halted = 1; } - *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); + *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS); env->prom_addr = prom_addr; } -- cgit v1.2.1