[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/23] spapr: Move nested KVM hypercalls under a TCG only config.
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 09/23] spapr: Move nested KVM hypercalls under a TCG only config. |
Date: |
Wed, 20 Apr 2022 19:13:15 -0300 |
From: Fabiano Rosas <farosas@linux.ibm.com>
These are the spapr virtual hypervisor implementation of the nested
KVM API. They only make sense when running with TCG.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20220325221113.255834-3-farosas@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_hcall.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 9b24db5e44..d761a7d0c3 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1473,7 +1473,7 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu,
target_ulong opcode,
return H_FUNCTION;
}
-/* TCG only */
+#ifdef CONFIG_TCG
#define PRTS_MASK 0x1f
static target_ulong h_set_ptbl(PowerPCCPU *cpu,
@@ -1800,18 +1800,35 @@ out_restore_l1:
spapr_cpu->nested_host_state = NULL;
}
-#ifdef CONFIG_TCG
+static void hypercall_register_nested(void)
+{
+ spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl);
+ spapr_register_hypercall(KVMPPC_H_ENTER_NESTED, h_enter_nested);
+ spapr_register_hypercall(KVMPPC_H_TLB_INVALIDATE, h_tlb_invalidate);
+ spapr_register_hypercall(KVMPPC_H_COPY_TOFROM_GUEST, h_copy_tofrom_guest);
+}
+
static void hypercall_register_softmmu(void)
{
/* DO NOTHING */
}
#else
+void spapr_exit_nested(PowerPCCPU *cpu, int excp)
+{
+ g_assert_not_reached();
+}
+
static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr,
target_ulong opcode, target_ulong *args)
{
g_assert_not_reached();
}
+static void hypercall_register_nested(void)
+{
+ /* DO NOTHING */
+}
+
static void hypercall_register_softmmu(void)
{
/* hcall-pft */
@@ -1881,10 +1898,7 @@ static void hypercall_register_types(void)
spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt);
- spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl);
- spapr_register_hypercall(KVMPPC_H_ENTER_NESTED, h_enter_nested);
- spapr_register_hypercall(KVMPPC_H_TLB_INVALIDATE, h_tlb_invalidate);
- spapr_register_hypercall(KVMPPC_H_COPY_TOFROM_GUEST, h_copy_tofrom_guest);
+ hypercall_register_nested();
}
type_init(hypercall_register_types)
--
2.35.1
- [PULL 00/23] ppc queue, Daniel Henrique Barboza, 2022/04/20
- [PULL 01/23] ppc/pnv: Update skiboot to v7.0, Daniel Henrique Barboza, 2022/04/20
- [PULL 02/23] ppc/spapr/ddw: Add 2M pagesize, Daniel Henrique Barboza, 2022/04/20
- [PULL 03/23] ppc/pnv: Fix PSI IRQ definition, Daniel Henrique Barboza, 2022/04/20
- [PULL 04/23] ppc/pnv: Remove PnvLpcController::psi link, Daniel Henrique Barboza, 2022/04/20
- [PULL 05/23] ppc/pnv: Remove PnvOCC::psi link, Daniel Henrique Barboza, 2022/04/20
- [PULL 06/23] ppc/pnv: Remove PnvPsiClas::irq_set, Daniel Henrique Barboza, 2022/04/20
- [PULL 07/23] ppc/pnv: Remove useless checks in set_irq handlers, Daniel Henrique Barboza, 2022/04/20
- [PULL 08/23] spapr: Move hypercall_register_softmmu, Daniel Henrique Barboza, 2022/04/20
- [PULL 09/23] spapr: Move nested KVM hypercalls under a TCG only config.,
Daniel Henrique Barboza <=
- [PULL 10/23] target/ppc: Improve KVM hypercall trace, Daniel Henrique Barboza, 2022/04/20
- [PULL 11/23] qemu/int128: add int128_urshift, Daniel Henrique Barboza, 2022/04/20
- [PULL 12/23] softfloat: add uint128_to_float128, Daniel Henrique Barboza, 2022/04/20
- [PULL 13/23] softfloat: add int128_to_float128, Daniel Henrique Barboza, 2022/04/20
- [PULL 14/23] softfloat: add float128_to_uint128, Daniel Henrique Barboza, 2022/04/20
- [PULL 15/23] softfloat: add float128_to_int128, Daniel Henrique Barboza, 2022/04/20
- [PULL 16/23] target/ppc: implement xscv[su]qqp, Daniel Henrique Barboza, 2022/04/20
- [PULL 17/23] target/ppc: implement xscvqp[su]qz, Daniel Henrique Barboza, 2022/04/20
- [PULL 18/23] hw/ppc/ppc405_boards: Initialize g_autofree pointer, Daniel Henrique Barboza, 2022/04/20
- [PULL 19/23] ppc/vof: Fix uninitialized string tracing, Daniel Henrique Barboza, 2022/04/20