target/ppc: add helper for books vhyp hypercall handler
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. Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Message-Id: <20220216102545.1808018-7-npiggin@gmail.com> Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
parent
f32d4ab41c
commit
4c6cf6b295
@ -1278,6 +1278,18 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TARGET_PPC64
|
#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)
|
static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
|
||||||
{
|
{
|
||||||
CPUState *cs = CPU(cpu);
|
CPUState *cs = CPU(cpu);
|
||||||
@ -1439,7 +1451,7 @@ static void powerpc_excp_books(PowerPCCPU *cpu, int excp)
|
|||||||
env->nip += 4;
|
env->nip += 4;
|
||||||
|
|
||||||
/* "PAPR mode" built-in hypercall emulation */
|
/* "PAPR mode" built-in hypercall emulation */
|
||||||
if ((lev == 1) && cpu->vhyp) {
|
if ((lev == 1) && books_vhyp_handles_hcall(cpu)) {
|
||||||
PPCVirtualHypervisorClass *vhc =
|
PPCVirtualHypervisorClass *vhc =
|
||||||
PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
|
PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
|
||||||
vhc->hypercall(cpu->vhyp, cpu);
|
vhc->hypercall(cpu->vhyp, cpu);
|
||||||
|
Loading…
Reference in New Issue
Block a user