From patchwork Sat Apr 16 22:10:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 91507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 429E2B6FE9 for ; Sun, 17 Apr 2011 08:13:13 +1000 (EST) Received: from localhost ([::1]:34177 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBDjq-0004cr-I3 for incoming@patchwork.ozlabs.org; Sat, 16 Apr 2011 18:13:10 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3GMBkdr031019 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 16 Apr 2011 18:11:46 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p3GMBj0J009348; Sat, 16 Apr 2011 18:11:45 -0400 Received: from amt.cnet (vpn-9-82.rdu.redhat.com [10.11.9.82]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p3GMBj8j018394; Sat, 16 Apr 2011 18:11:45 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id AE9456521E4; Sat, 16 Apr 2011 19:10:28 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p3GMAQ9p003964; Sat, 16 Apr 2011 19:10:26 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Sat, 16 Apr 2011 19:10:07 -0300 Message-Id: <4299f1462c1fa07185e37a1f0a56a307549c321e.1302991808.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 5/6] Redirect cpu_interrupt to callback handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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)