Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / target-openrisc / interrupt.c

diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index 642da7de49e757e98211af3c496ab200bab60c2b..16ef4b3e79f836e3e65a05a953387b4318461707 100644 (file)
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -19,14 +19,16 @@
 
 #include "cpu.h"
 #include "qemu-common.h"
-#include "gdbstub.h"
-#include "host-utils.h"
+#include "exec/gdbstub.h"
+#include "qemu/host-utils.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/loader.h"
 #endif
 
-void do_interrupt(CPUOpenRISCState *env)
+void openrisc_cpu_do_interrupt(CPUState *cs)
 {
+    OpenRISCCPU *cpu = OPENRISC_CPU(cs);
+    CPUOpenRISCState *env = &cpu->env;
 #ifndef CONFIG_USER_ONLY
     if (env->flags & D_FLAG) { /* Delay Slot insn */
         env->flags &= ~D_FLAG;