diff options
author | Hollis Blanchard <hollisb@us.ibm.com> | 2009-01-03 17:23:01 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-03-24 05:02:56 -0400 |
commit | 58a96214a306fc7fc66105097eea9c4f3bfa35bc (patch) | |
tree | 2049ecd13795b80f1f0962bdbc38c9be3b17fd3a /arch/powerpc/kvm/booke.c | |
parent | 475e7cdd69101939006659a63c2e4a32d5b71389 (diff) |
KVM: ppc: change kvmppc_mmu_map() parameters
Passing just the TLB index will ease an e500 implementation.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/booke.c')
-rw-r--r-- | arch/powerpc/kvm/booke.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index d196ae619303..85b9e2fc6c6b 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c | |||
@@ -316,8 +316,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, | |||
316 | * b) the guest used a large mapping which we're faking | 316 | * b) the guest used a large mapping which we're faking |
317 | * Either way, we need to satisfy the fault without | 317 | * Either way, we need to satisfy the fault without |
318 | * invoking the guest. */ | 318 | * invoking the guest. */ |
319 | kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlbe->tid, | 319 | kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index); |
320 | gtlbe->word2, get_tlb_bytes(gtlbe), gtlb_index); | ||
321 | kvmppc_account_exit(vcpu, DTLB_VIRT_MISS_EXITS); | 320 | kvmppc_account_exit(vcpu, DTLB_VIRT_MISS_EXITS); |
322 | r = RESUME_GUEST; | 321 | r = RESUME_GUEST; |
323 | } else { | 322 | } else { |
@@ -364,8 +363,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, | |||
364 | * b) the guest used a large mapping which we're faking | 363 | * b) the guest used a large mapping which we're faking |
365 | * Either way, we need to satisfy the fault without | 364 | * Either way, we need to satisfy the fault without |
366 | * invoking the guest. */ | 365 | * invoking the guest. */ |
367 | kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlbe->tid, | 366 | kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index); |
368 | gtlbe->word2, get_tlb_bytes(gtlbe), gtlb_index); | ||
369 | } else { | 367 | } else { |
370 | /* Guest mapped and leaped at non-RAM! */ | 368 | /* Guest mapped and leaped at non-RAM! */ |
371 | kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_MACHINE_CHECK); | 369 | kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_MACHINE_CHECK); |