[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] target/ppc: add helper for books vhyp hypercall handler
From: |
Nicholas Piggin |
Subject: |
[PATCH 6/9] target/ppc: add helper for books vhyp hypercall handler |
Date: |
Tue, 15 Feb 2022 13:16:39 +1000 |
The virtual hypervisor currently always intercepts and handles
hypercalls but with a future change this will not always be the case.
Add a helper for the test so the logic is abstracted from the mechanism.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
target/ppc/excp_helper.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index fcc83a7701..6b6ec71bc2 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -1278,6 +1278,18 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
}
#ifdef TARGET_PPC64
+/*
+ * When running under vhyp, hcalls are always intercepted and sent to the
+ * vhc->hypercall handler.
+ */
+static bool books_vhyp_handles_hcall(PowerPCCPU *cpu)
+{
+ if (cpu->vhyp) {
+ return true;
+ }
+ return false;
+}
+
static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
{
CPUState *cs = CPU(cpu);
@@ -1439,7 +1451,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
env->nip += 4;
/* "PAPR mode" built-in hypercall emulation */
- if ((lev == 1) && cpu->vhyp) {
+ if ((lev == 1) && books_vhyp_handles_hcall(cpu)) {
PPCVirtualHypervisorClass *vhc =
PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
vhc->hypercall(cpu->vhyp, cpu);
--
2.23.0
- Re: [PATCH 1/9] target/ppc: raise HV interrupts for partition table entry problems, (continued)
- [PATCH 2/9] spapr: prevent hdec timer being set up under virtual hypervisor, Nicholas Piggin, 2022/02/14
- [PATCH 3/9] ppc: allow the hdecr timer to be created/destroyed, Nicholas Piggin, 2022/02/14
- [PATCH 4/9] target/ppc: add vhyp addressing mode helper for radix MMU, Nicholas Piggin, 2022/02/14
- [PATCH 5/9] target/ppc: make vhyp get_pate method take lpid and return success, Nicholas Piggin, 2022/02/14
- [PATCH 6/9] target/ppc: add helper for books vhyp hypercall handler,
Nicholas Piggin <=
- [PATCH 7/9] target/ppc: Add powerpc_reset_excp_state helper, Nicholas Piggin, 2022/02/14
- [PATCH 8/9] target/ppc: Introduce a vhyp framework for nested HV support, Nicholas Piggin, 2022/02/14
- [PATCH 9/9] spapr: implement nested-hv capability for the virtual hypervisor, Nicholas Piggin, 2022/02/14