motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

exec: Pass CPUState to cpu_reset_interrupt()

Browse source 
Move it to qom/cpu.c to avoid build failures depending on include order
of cpu-qom.h and exec/cpu-all.h.

Change opaques of various ..._irq_handler() functions to the
appropriate CPU type to facilitate using cpu_reset_interrupt().

Fix Coding Style issues while at it (missing braces, indentation).

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-01-17 22:30:20 +01:00
parent 259186a7d2
commit d8ed887bdc
24 changed files with 105 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hw/cris/pic_cpu.c
View file

@ -30,16 +30,19 @@
static void cris_pic_cpu_handler(void *opaque, int irq, int level)
{
CPUCRISState *env = (CPUCRISState *)opaque;
CRISCPU *cpu = opaque;
CPUCRISState *env = &cpu->env;
CPUState *cs = CPU(cpu);
int type = irq ? CPU_INTERRUPT_NMI : CPU_INTERRUPT_HARD;
if (level)
if (level) {
cpu_interrupt(env, type);
else
cpu_reset_interrupt(env, type);
} else {
cpu_reset_interrupt(cs, type);
}
}
qemu_irq *cris_pic_init_cpu(CPUCRISState *env)
{
return qemu_allocate_irqs(cris_pic_cpu_handler, env, 2);
return qemu_allocate_irqs(cris_pic_cpu_handler, cris_env_get_cpu(env), 2);
}