From b7b0b1f13a9d0b77b3dcb7696de420c2e805ca25 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 20 Feb 2017 10:47:09 +1100 Subject: target/ppc: Merge cpu_ppc_set_vhyp() with cpu_ppc_set_papr() 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 Reviewed-by: Suraj Jitindar Singh --- target/ppc/cpu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'target/ppc/cpu.h') diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index c022984..2a94e76 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1301,8 +1301,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 -- cgit v1.1