From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhLJp-0006qX-2U for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhLJj-0000kw-JQ for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:40 -0400 Received: from mail-ob0-x235.google.com ([2607:f8b0:4003:c01::235]:61377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhLJj-0000kq-Ff for qemu-devel@nongnu.org; Mon, 05 May 2014 12:00:35 -0400 Received: by mail-ob0-f181.google.com with SMTP id wm4so1812526obc.26 for ; Mon, 05 May 2014 09:00:34 -0700 (PDT) From: Rob Herring Date: Mon, 5 May 2014 11:00:17 -0500 Message-Id: <1399305623-22016-2-git-send-email-robherring2@gmail.com> In-Reply-To: <1399305623-22016-1-git-send-email-robherring2@gmail.com> References: <1399305623-22016-1-git-send-email-robherring2@gmail.com> Subject: [Qemu-devel] [PATCH 1/7] target-arm: use correct do_interrupt handler for AArch64 user mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Rob Herring , qemu-devel@nongnu.org, Christoffer Dall From: Rob Herring User mode emulation should never get interrupts and thus should not use the system emulation exception handler function. Signed-off-by: Rob Herring --- target-arm/cpu64.c | 4 ++++ target-arm/helper-a64.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index 8daa622..98d402f 100644 --- a/target-arm/cpu64.c +++ b/target-arm/cpu64.c @@ -187,7 +187,11 @@ static void aarch64_cpu_class_init(ObjectClass *oc, void *data) { CPUClass *cc = CPU_CLASS(oc); +#if defined(CONFIG_USER_ONLY) + cc->do_interrupt = arm_cpu_do_interrupt; +#else cc->do_interrupt = aarch64_cpu_do_interrupt; +#endif cc->set_pc = aarch64_cpu_set_pc; cc->gdb_read_register = aarch64_cpu_gdb_read_register; cc->gdb_write_register = aarch64_cpu_gdb_write_register; diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index bf921cc..84411b4 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -438,6 +438,8 @@ float32 HELPER(fcvtx_f64_to_f32)(float64 a, CPUARMState *env) return r; } +#if !defined(CONFIG_USER_ONLY) + /* Handle a CPU exception. */ void aarch64_cpu_do_interrupt(CPUState *cs) { @@ -512,3 +514,4 @@ void aarch64_cpu_do_interrupt(CPUState *cs) env->pc = addr; cs->interrupt_request |= CPU_INTERRUPT_EXITTB; } +#endif -- 1.9.1