diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-18 15:03:43 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-03-12 10:35:55 +0100 |
| commit | c3affe5670e5d0df8a7e06f1d6e80853633146df (patch) | |
| tree | bc2a6d0877cf7aea8821053cf6c8df10f167caa5 /hw/lm32 | |
| parent | d8ed887bdcd29ce2e967f8b15a6a2b6dcaa11cd5 (diff) | |
| download | qemu-c3affe5670e5d0df8a7e06f1d6e80853633146df.zip qemu-c3affe5670e5d0df8a7e06f1d6e80853633146df.tar.gz qemu-c3affe5670e5d0df8a7e06f1d6e80853633146df.tar.bz2 | |
cpu: Pass CPUState to cpu_interrupt()
Move it to qom/cpu.h to avoid issues with include order.
Change pc_acpi_smi_interrupt() opaque to X86CPU.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/lm32')
| -rw-r--r-- | hw/lm32/lm32_boards.c | 3 | ||||
| -rw-r--r-- | hw/lm32/milkymist.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 538c203..db92948 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -42,11 +42,10 @@ typedef struct { static void cpu_irq_handler(void *opaque, int irq, int level) { LM32CPU *cpu = opaque; - CPULM32State *env = &cpu->env; CPUState *cs = CPU(cpu); if (level) { - cpu_interrupt(env, CPU_INTERRUPT_HARD); + cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); } diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 9ff6d28..b347cf9 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -47,11 +47,10 @@ typedef struct { static void cpu_irq_handler(void *opaque, int irq, int level) { LM32CPU *cpu = opaque; - CPULM32State *env = &cpu->env; CPUState *cs = CPU(cpu); if (level) { - cpu_interrupt(env, CPU_INTERRUPT_HARD); + cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); } |