Re: [PATCH 6/9] target/ppc: add helper for books vhyp hypercall handler

[Cédric Le Goater]

On 2/15/22 04:16, Nicholas Piggin wrote:
> 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>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


> ---
>   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);