aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHollis Blanchard <hollisb@us.ibm.com>2009-01-03 17:23:03 -0500
committerAvi Kivity <avi@redhat.com>2009-03-24 05:02:56 -0400
commitfa86b8dda2e0faccefbeda61edc02a50bd588f4f (patch)
treed86fa2b51cafba9d226f32de4f4d7f189f792875 /arch
parentbe8d1cae07d5acf4a61046d7def5eda40f0981e1 (diff)
KVM: ppc: rename 44x MMU functions used in booke.c
e500 will provide its own implementation of these. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/include/asm/kvm_ppc.h2
-rw-r--r--arch/powerpc/kvm/44x_tlb.c4
-rw-r--r--arch/powerpc/kvm/44x_tlb.h2
-rw-r--r--arch/powerpc/kvm/booke.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index 9fd70aa916d9..5e80a20f32b8 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -59,6 +59,8 @@ extern void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,
59extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode); 59extern void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode);
60extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid); 60extern void kvmppc_mmu_switch_pid(struct kvm_vcpu *vcpu, u32 pid);
61extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu); 61extern void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu);
62extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
63extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
62extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index, 64extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
63 gva_t eaddr); 65 gva_t eaddr);
64 66
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index 2f14671e8a15..e67b7313ffc3 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -218,14 +218,14 @@ gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
218 return get_tlb_raddr(gtlbe) | (eaddr & pgmask); 218 return get_tlb_raddr(gtlbe) | (eaddr & pgmask);
219} 219}
220 220
221int kvmppc_44x_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr) 221int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
222{ 222{
223 unsigned int as = !!(vcpu->arch.msr & MSR_IS); 223 unsigned int as = !!(vcpu->arch.msr & MSR_IS);
224 224
225 return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as); 225 return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as);
226} 226}
227 227
228int kvmppc_44x_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr) 228int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
229{ 229{
230 unsigned int as = !!(vcpu->arch.msr & MSR_DS); 230 unsigned int as = !!(vcpu->arch.msr & MSR_DS);
231 231
diff --git a/arch/powerpc/kvm/44x_tlb.h b/arch/powerpc/kvm/44x_tlb.h
index 05b6f7eef5b6..a9ff80e51526 100644
--- a/arch/powerpc/kvm/44x_tlb.h
+++ b/arch/powerpc/kvm/44x_tlb.h
@@ -25,8 +25,6 @@
25 25
26extern int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr, 26extern int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr,
27 unsigned int pid, unsigned int as); 27 unsigned int pid, unsigned int as);
28extern int kvmppc_44x_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
29extern int kvmppc_44x_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
30 28
31extern int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, 29extern int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb,
32 u8 rc); 30 u8 rc);
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 56d6ed69ed60..1e692ac16e99 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -292,7 +292,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
292 gfn_t gfn; 292 gfn_t gfn;
293 293
294 /* Check the guest TLB. */ 294 /* Check the guest TLB. */
295 gtlb_index = kvmppc_44x_dtlb_index(vcpu, eaddr); 295 gtlb_index = kvmppc_mmu_dtlb_index(vcpu, eaddr);
296 if (gtlb_index < 0) { 296 if (gtlb_index < 0) {
297 /* The guest didn't have a mapping for it. */ 297 /* The guest didn't have a mapping for it. */
298 kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS); 298 kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS);
@@ -337,7 +337,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
337 r = RESUME_GUEST; 337 r = RESUME_GUEST;
338 338
339 /* Check the guest TLB. */ 339 /* Check the guest TLB. */
340 gtlb_index = kvmppc_44x_itlb_index(vcpu, eaddr); 340 gtlb_index = kvmppc_mmu_itlb_index(vcpu, eaddr);
341 if (gtlb_index < 0) { 341 if (gtlb_index < 0) {
342 /* The guest didn't have a mapping for it. */ 342 /* The guest didn't have a mapping for it. */
343 kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS); 343 kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS);