Re: [PATCH v2 2/2] spapr: Move nested KVM hypercalls under a TCG only config.

[Nicholas Piggin <npiggin@gmail.com>]

Excerpts from Fabiano Rosas's message of March 26, 2022 8:11 am:
> These are the spapr virtual hypervisor implementation of the nested
> KVM API. They only make sense when running with TCG.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>

> 
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.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 08b50590a8..9244aa3ad8 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
> 
>