Commit 3f1268dd authored by Greg Kurz's avatar Greg Kurz Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S PR: Move kvmppc_mmu_init() into PR KVM 



This is only relevant to PR KVM. Make it obvious by moving the
function declaration to the Book3s header and rename it with
a _pr suffix.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent b2fa4f90

arch/powerpc/include/asm/kvm_ppc.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, 
extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);

extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);

extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_init(struct kvm_vcpu *vcpu);

extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);

extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,

arch/powerpc/kvm/book3s.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ extern int kvm_age_hva_hv(struct kvm *kvm, unsigned long start, 
extern int kvm_test_age_hva_hv(struct kvm *kvm, unsigned long hva);

extern void kvm_set_spte_hva_hv(struct kvm *kvm, unsigned long hva, pte_t pte);



extern int kvmppc_mmu_init_pr(struct kvm_vcpu *vcpu);

extern void kvmppc_mmu_destroy_pr(struct kvm_vcpu *vcpu);

extern int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,

				     unsigned int inst, int *advance);

arch/powerpc/kvm/book3s_32_mmu_host.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ void kvmppc_mmu_destroy_pr(struct kvm_vcpu *vcpu) 
/* From mm/mmu_context_hash32.c */

#define CTX_TO_VSID(c, id)	((((c) * (897 * 16)) + (id * 0x111)) & 0xffffff)



int kvmppc_mmu_init(struct kvm_vcpu *vcpu)

int kvmppc_mmu_init_pr(struct kvm_vcpu *vcpu)

{

	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int err;

arch/powerpc/kvm/book3s_64_mmu_host.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ void kvmppc_mmu_destroy_pr(struct kvm_vcpu *vcpu) 
	__destroy_context(to_book3s(vcpu)->context_id[0]);

}



int kvmppc_mmu_init(struct kvm_vcpu *vcpu)

int kvmppc_mmu_init_pr(struct kvm_vcpu *vcpu)

{

	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int err;

arch/powerpc/kvm/book3s_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ static int kvmppc_core_vcpu_create_pr(struct kvm_vcpu *vcpu) 


	vcpu->arch.shadow_msr = MSR_USER64 & ~MSR_LE;



	err = kvmppc_mmu_init(vcpu);

	err = kvmppc_mmu_init_pr(vcpu);

	if (err < 0)

		goto free_shared_page;

CRA Git | Maintained and supported by SUSTech CRA and CCSE