SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

spapr: Move nested KVM hypercalls under a TCG only config.

Browse Source 
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>
This commit is contained in:
Fabiano Rosas 2022-03-25 19:11:13 -03:00 committed by Daniel Henrique Barboza
parent 0939ac2cd9
commit 365acf15d3
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/ppc/spapr_hcall.c
View File

@ -1473,7 +1473,7 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,
return H_FUNCTION; return H_FUNCTION;
} }
/* TCG only */ #ifdef CONFIG_TCG
#define PRTS_MASK 0x1f #define PRTS_MASK 0x1f
static target_ulong h_set_ptbl(PowerPCCPU *cpu, static target_ulong h_set_ptbl(PowerPCCPU *cpu,
@ -1800,18 +1800,35 @@ out_restore_l1:
spapr_cpu->nested_host_state = NULL; 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) static void hypercall_register_softmmu(void)
{ {
/* DO NOTHING */ /* DO NOTHING */
} }
#else #else
void spapr_exit_nested(PowerPCCPU *cpu, int excp)
{
g_assert_not_reached();
}
static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr, static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
g_assert_not_reached(); g_assert_not_reached();
} }
static void hypercall_register_nested(void)
{
/* DO NOTHING */
}
static void hypercall_register_softmmu(void) static void hypercall_register_softmmu(void)
{ {
/* hcall-pft */ /* 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_UPDATE_DT, h_update_dt);
spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl); hypercall_register_nested();
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);
} }
type_init(hypercall_register_types) type_init(hypercall_register_types)