diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-10-12 04:23:04 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-10-13 10:44:13 +0000 |
| commit | e0bbf9b573e1a19a906abef861ee28293e44b3a2 (patch) | |
| tree | 4d00f74b6b43ce4cea25e25e5a6ecbd0757be7bb /hw/sun4m.c | |
| parent | 203342d8dc852bc09488e9dc5b853aa48aeed14c (diff) | |
| download | focaccia-qemu-e0bbf9b573e1a19a906abef861ee28293e44b3a2.tar.gz focaccia-qemu-e0bbf9b573e1a19a906abef861ee28293e44b3a2.zip | |
sun4m: Pass SPARCCPU to cpu_set_irq()
Needed for changing cpu_kick_irq() argument type to SPARCCPU. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 5 |
1 files 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; } |