From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXQjK-0007Ay-F8 for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXQjE-0005Kp-CW for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:18:18 -0400 Received: from mail-yk0-x231.google.com ([2607:f8b0:4002:c07::231]:47084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXQjE-0005Jr-8A for qemu-devel@nongnu.org; Fri, 26 Sep 2014 04:18:12 -0400 Received: by mail-yk0-f177.google.com with SMTP id 9so3948500ykp.22 for ; Fri, 26 Sep 2014 01:18:07 -0700 (PDT) From: "Edgar E. Iglesias" Date: Fri, 26 Sep 2014 18:08:31 +1000 Message-Id: <1411718914-6608-9-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1411718914-6608-1-git-send-email-edgar.iglesias@gmail.com> References: <1411718914-6608-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v7 08/11] target-arm: Add a Hypervisor Trap exception type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, serge.fdrv@gmail.com, agraf@suse.de, greg.bellows@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-arm/cpu.h | 1 + target-arm/helper-a64.c | 1 + target-arm/helper.c | 1 + target-arm/internals.h | 1 + 4 files changed, 4 insertions(+) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index b553f3d..ef933e8 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -52,6 +52,7 @@ #define EXCP_KERNEL_TRAP 9 /* Jumped to kernel code page. */ #define EXCP_STREX 10 #define EXCP_HVC 11 /* HyperVisor Call */ +#define EXCP_HYP_TRAP 12 #define ARMV7M_EXCP_RESET 1 #define ARMV7M_EXCP_NMI 2 diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 4e6ca26..0a7c155 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -477,6 +477,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) case EXCP_UDEF: case EXCP_SWI: case EXCP_HVC: + case EXCP_HYP_TRAP: env->cp15.esr_el[new_el] = env->exception.syndrome; break; case EXCP_IRQ: diff --git a/target-arm/helper.c b/target-arm/helper.c index 9e7d0f6..802d779 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3664,6 +3664,7 @@ unsigned int arm_excp_target_el(CPUState *cs, unsigned int excp_idx) switch (excp_idx) { case EXCP_HVC: + case EXCP_HYP_TRAP: target_el = 2; break; default: diff --git a/target-arm/internals.h b/target-arm/internals.h index afcc4e0..4fbb136 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -54,6 +54,7 @@ static const char * const excnames[] = { [EXCP_KERNEL_TRAP] = "QEMU intercept of kernel commpage", [EXCP_STREX] = "QEMU intercept of STREX", [EXCP_HVC] = "Hypervisor Call", + [EXCP_HYP_TRAP] = "Hypervisor Trap", }; static inline void arm_log_exception(int idx) -- 1.9.1