From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBDiY-0002fx-KH for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBDiW-0002Cx-Te for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBDiW-0002By-Jd for qemu-devel@nongnu.org; Sat, 16 Apr 2011 18:11:48 -0400 From: Marcelo Tosatti Date: Sat, 16 Apr 2011 19:10:07 -0300 Message-Id: <4299f1462c1fa07185e37a1f0a56a307549c321e.1302991808.git.mtosatti@redhat.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH 5/6] Redirect cpu_interrupt to callback handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka 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 Signed-off-by: Marcelo Tosatti --- cpu-all.h | 14 +++++++++++++- exec.c | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index dc0f2f0..628206e 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -789,7 +789,19 @@ extern CPUState *cpu_single_env; #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); diff --git a/exec.c b/exec.c index cc0806e..72f4784 100644 --- a/exec.c +++ b/exec.c @@ -1632,7 +1632,7 @@ static void cpu_unlink_tb(CPUState *env) #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; @@ -1659,6 +1659,8 @@ void cpu_interrupt(CPUState *env, int mask) } } +CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt; + #else /* CONFIG_USER_ONLY */ void cpu_interrupt(CPUState *env, int mask) -- 1.7.4.2