commit ec6959d0466fb240fe4d94d5f525eebf9ba18b84
author Jan Kiszka <jan.kiszka@siemens.com> Wed Apr 13 01:32:56 2011 +0200
committer Marcelo Tosatti <mtosatti@redhat.com> Mon May 02 09:38:35 2011 -0300
tree 7e9c62ca8ca6bcae7459c819f11252c75271b7c6
parent 97ffbd8d9d54736dd73227e5330c7f5cdc2d7a96

Redirect cpu_interrupt to callback handler

This allows to override the interrupt handling of QEMU in system mode.
KVM will make use of it to set a specialized handler.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

cpu-all.h

diff --git a/cpu-all.h b/cpu-all.h
index 0bae6df..88126ea 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -799,7 +799,19 @@
 #define CPU_INTERRUPT_SIPI   0x800 /* SIPI pending. */
 #define CPU_INTERRUPT_MCE    0x1000 /* (x86 only) MCE pending. */
 
-void cpu_interrupt(CPUState *s, int mask);
+#ifndef CONFIG_USER_ONLY
+typedef void (*CPUInterruptHandler)(CPUState *, int);
+
+extern CPUInterruptHandler cpu_interrupt_handler;
+
+static inline void cpu_interrupt(CPUState *s, int mask)
+{
+    cpu_interrupt_handler(s, mask);
+}
+#else /* USER_ONLY */
+void cpu_interrupt(CPUState *env, int mask);
+#endif /* USER_ONLY */
+
 void cpu_reset_interrupt(CPUState *env, int mask);
 
 void cpu_exit(CPUState *s);

exec.c

diff --git a/exec.c b/exec.c
index d6d8a89..a718d74 100644
--- a/exec.c
+++ b/exec.c
@@ -1631,7 +1631,7 @@
 
 #ifndef CONFIG_USER_ONLY
 /* mask must never be zero, except for A20 change call */
-void cpu_interrupt(CPUState *env, int mask)
+static void tcg_handle_interrupt(CPUState *env, int mask)
 {
     int old_mask;
 
@@ -1658,6 +1658,8 @@
     }
 }
 
+CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;
+
 #else /* CONFIG_USER_ONLY */
 
 void cpu_interrupt(CPUState *env, int mask)