| Message ID | 20170223020936.29220-3-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
On Thu, 2017-02-23 at 13:09 +1100, David Gibson wrote: > cpu_ppc_set_papr() sets up various aspects of CPU state for use with > PAPR > paravirtualized guests. However, it doesn't set the virtual > hypervisor, > so callers must also call cpu_ppc_set_vhyp() so that PAPR hypercalls > are > handled properly. This is a bit silly, so fold setting the virtual > hypervisor into cpu_ppc_set_papr(). > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr_cpu_core.c | 3 +-- > target/ppc/cpu.h | 3 +-- > target/ppc/translate_init.c | 10 +++------- > 3 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index 55cd045..76563c4 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -57,8 +57,7 @@ static void spapr_cpu_init(sPAPRMachineState > *spapr, PowerPCCPU *cpu, > cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ); > > /* Enable PAPR mode in TCG or KVM */ > - cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr)); > - cpu_ppc_set_papr(cpu); > + cpu_ppc_set_papr(cpu, PPC_VIRTUAL_HYPERVISOR(spapr)); > > if (cpu->max_compat) { > Error *local_err = NULL; > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 425e79d..f99bcae 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1300,8 +1300,7 @@ void store_booke_tcr (CPUPPCState *env, > target_ulong val); > void store_booke_tsr (CPUPPCState *env, target_ulong val); > void ppc_tlb_invalidate_all (CPUPPCState *env); > void ppc_tlb_invalidate_one (CPUPPCState *env, target_ulong addr); > -void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp); > -void cpu_ppc_set_papr(PowerPCCPU *cpu); > +void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp); > #endif > #endif > > diff --git a/target/ppc/translate_init.c > b/target/ppc/translate_init.c > index be35cbd..a1405e9 100644 > --- a/target/ppc/translate_init.c > +++ b/target/ppc/translate_init.c > @@ -8835,18 +8835,14 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void > *data) > } > > #if !defined(CONFIG_USER_ONLY) > - > -void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp) > -{ > - cpu->vhyp = vhyp; > -} > - > -void cpu_ppc_set_papr(PowerPCCPU *cpu) > +void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp) > { > CPUPPCState *env = &cpu->env; > ppc_spr_t *lpcr = &env->spr_cb[SPR_LPCR]; > ppc_spr_t *amor = &env->spr_cb[SPR_AMOR]; > > + cpu->vhyp = vhyp; > + > /* PAPR always has exception vectors in RAM not ROM. To ensure > this, > * MSR[IP] should never be set. > * Sounds Good Reviewed-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 55cd045..76563c4 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -57,8 +57,7 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu, cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ); /* Enable PAPR mode in TCG or KVM */ - cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr)); - cpu_ppc_set_papr(cpu); + cpu_ppc_set_papr(cpu, PPC_VIRTUAL_HYPERVISOR(spapr)); if (cpu->max_compat) { Error *local_err = NULL; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 425e79d..f99bcae 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1300,8 +1300,7 @@ void store_booke_tcr (CPUPPCState *env, target_ulong val); void store_booke_tsr (CPUPPCState *env, target_ulong val); void ppc_tlb_invalidate_all (CPUPPCState *env); void ppc_tlb_invalidate_one (CPUPPCState *env, target_ulong addr); -void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp); -void cpu_ppc_set_papr(PowerPCCPU *cpu); +void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp); #endif #endif diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index be35cbd..a1405e9 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -8835,18 +8835,14 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) } #if !defined(CONFIG_USER_ONLY) - -void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp) -{ - cpu->vhyp = vhyp; -} - -void cpu_ppc_set_papr(PowerPCCPU *cpu) +void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp) { CPUPPCState *env = &cpu->env; ppc_spr_t *lpcr = &env->spr_cb[SPR_LPCR]; ppc_spr_t *amor = &env->spr_cb[SPR_AMOR]; + cpu->vhyp = vhyp; + /* PAPR always has exception vectors in RAM not ROM. To ensure this, * MSR[IP] should never be set. *
cpu_ppc_set_papr() sets up various aspects of CPU state for use with PAPR paravirtualized guests. However, it doesn't set the virtual hypervisor, so callers must also call cpu_ppc_set_vhyp() so that PAPR hypercalls are handled properly. This is a bit silly, so fold setting the virtual hypervisor into cpu_ppc_set_papr(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_cpu_core.c | 3 +-- target/ppc/cpu.h | 3 +-- target/ppc/translate_init.c | 10 +++------- 3 files changed, 5 insertions(+), 11 deletions(-)