Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a576f7a2 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Remove obsolete kvmppc_mmu_find_pte 



Initially we had to search for pte entries to invalidate them. Since
the logic has improved since then, we can just get rid of the search
function.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent bbeb3406

arch/powerpc/include/asm/kvm_book3s.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ extern void kvmppc_mmu_book3s_32_init(struct kvm_vcpu *vcpu); 
extern int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte);

extern int kvmppc_mmu_map_segment(struct kvm_vcpu *vcpu, ulong eaddr);

extern void kvmppc_mmu_flush_segments(struct kvm_vcpu *vcpu);

extern struct kvmppc_pte *kvmppc_mmu_find_pte(struct kvm_vcpu *vcpu, u64 ea, bool data);

extern int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, bool data);

extern int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, bool data);

extern void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec);

arch/powerpc/kvm/book3s_32_mmu_host.c

+0 −20
Original line number Diff line number Diff line
@@ -150,26 +150,6 @@ void kvmppc_mmu_pte_pflush(struct kvm_vcpu *vcpu, ulong pa_start, ulong pa_end) 
	}

}



struct kvmppc_pte *kvmppc_mmu_find_pte(struct kvm_vcpu *vcpu, u64 ea, bool data)

{

	int i;

	u64 guest_vp;



	guest_vp = vcpu->arch.mmu.ea_to_vp(vcpu, ea, false);

	for (i=0; i<vcpu->arch.hpte_cache_offset; i++) {

		struct hpte_cache *pte;



		pte = &vcpu->arch.hpte_cache[i];

		if (!pte->host_va)

			continue;



		if (pte->pte.vpage == guest_vp)

			return &pte->pte;

	}



	return NULL;

}



static int kvmppc_mmu_hpte_cache_next(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.hpte_cache_offset == HPTEG_CACHE_NUM)

arch/powerpc/kvm/book3s_64_mmu_host.c

+0 −20
Original line number Diff line number Diff line
@@ -132,26 +132,6 @@ void kvmppc_mmu_pte_pflush(struct kvm_vcpu *vcpu, ulong pa_start, ulong pa_end) 
	}

}



struct kvmppc_pte *kvmppc_mmu_find_pte(struct kvm_vcpu *vcpu, u64 ea, bool data)

{

	int i;

	u64 guest_vp;



	guest_vp = vcpu->arch.mmu.ea_to_vp(vcpu, ea, false);

	for (i=0; i<vcpu->arch.hpte_cache_offset; i++) {

		struct hpte_cache *pte;



		pte = &vcpu->arch.hpte_cache[i];

		if (!pte->host_va)

			continue;



		if (pte->pte.vpage == guest_vp)

			return &pte->pte;

	}



	return NULL;

}



static int kvmppc_mmu_hpte_cache_next(struct kvm_vcpu *vcpu)

{

	if (vcpu->arch.hpte_cache_offset == HPTEG_CACHE_NUM)