On Thu, Mar 17, 2022 at 02:20:49PM -0300, Fabiano Rosas wrote: > 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 <faro...@linux.ibm.com> > --- > hw/ppc/spapr_hcall.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index c0bfc4bc9c..f2c802c155 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -2,6 +2,7 @@ > #include "qemu/cutils.h" > #include "qapi/error.h" > #include "sysemu/hw_accel.h" > +#include "sysemu/tcg.h" > #include "sysemu/runstate.h" > #include "qemu/log.h" > #include "qemu/main-loop.h" > @@ -1473,7 +1474,8 @@ 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, > @@ -1807,6 +1809,12 @@ out_restore_l1: > g_free(spapr_cpu->nested_host_state); > spapr_cpu->nested_host_state = NULL; > } > +#else > +void spapr_exit_nested(PowerPCCPU *cpu, int excp) > +{ > + g_assert_not_reached(); > +} > +#endif > > #ifndef CONFIG_TCG > static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr, > @@ -1829,7 +1837,10 @@ static void hypercall_register_softmmu(void) > #else > static void hypercall_register_softmmu(void) > { > - /* DO NOTHING */ > + 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);
This doesn't fit. This is specifically about the MMU hypercalls - if you want to put other things in there it needs a name change at least. > } > #endif > > @@ -1888,11 +1899,6 @@ static void hypercall_register_types(void) > spapr_register_hypercall(KVMPPC_H_CAS, h_client_architecture_support); > > 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); > } > > type_init(hypercall_register_types) -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature