From patchwork Fri Mar 18 12:19:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 643631 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2ICJumr011136 for ; Fri, 18 Mar 2011 12:19:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755690Ab1CRMTx (ORCPT ); Fri, 18 Mar 2011 08:19:53 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:41936 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754963Ab1CRMTx (ORCPT ); Fri, 18 Mar 2011 08:19:53 -0400 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate01.web.de (Postfix) with ESMTP id 4959D18B086B6; Fri, 18 Mar 2011 13:19:21 +0100 (CET) Received: from [88.65.248.169] (helo=localhost.localdomain) by smtp06.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1Q0YeH-0001iA-00; Fri, 18 Mar 2011 13:19:21 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH 2/3] Redirect cpu_interrupt to callback handler Date: Fri, 18 Mar 2011 13:19:15 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+T79/VfE4bnU+iTpIVZYaXhqA6IMdOLpvGxupf 4MGYblD6vo8pVLvbqHYg5nZl9KoO8qk6vQHOoQ7Drqi0wRfItG 5geA6Wk5Y= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 18 Mar 2011 12:19:56 +0000 (UTC) diff --git a/cpu-all.h b/cpu-all.h index 4f4631d..5835cfa 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -790,7 +790,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 4721f04..0c80f84 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)