diff options
| author | Avi Kivity | 2007-11-21 14:01:44 +0100 |
|---|---|---|
| committer | Avi Kivity | 2008-01-30 16:53:12 +0100 |
| commit | 1d28f5f4a4984be4cd7200ed512c94517c13e392 (patch) | |
| tree | 1ed90eca9769f1d5e076a538d8d3a5818dc3af8d /drivers/kvm/mmu.c | |
| parent | KVM: MMU: Remove gva_to_hpa() (diff) | |
| download | kernel-qcow2-linux-1d28f5f4a4984be4cd7200ed512c94517c13e392.tar.gz kernel-qcow2-linux-1d28f5f4a4984be4cd7200ed512c94517c13e392.tar.xz kernel-qcow2-linux-1d28f5f4a4984be4cd7200ed512c94517c13e392.zip | |
KVM: Remove gpa_to_hpa()
Converting last uses along the way.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/mmu.c')
| -rw-r--r-- | drivers/kvm/mmu.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 6aa0319ede4d..9b75b102b8d1 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c @@ -868,26 +868,13 @@ static void page_header_update_slot(struct kvm *kvm, void *pte, gfn_t gfn) __set_bit(slot, &page_head->slot_bitmap); } -hpa_t gpa_to_hpa(struct kvm *kvm, gpa_t gpa) -{ - struct page *page; - hpa_t hpa; - - ASSERT((gpa & HPA_ERR_MASK) == 0); - page = gfn_to_page(kvm, gpa >> PAGE_SHIFT); - hpa = ((hpa_t)page_to_pfn(page) << PAGE_SHIFT) | (gpa & (PAGE_SIZE-1)); - if (is_error_page(page)) - return hpa | HPA_ERR_MASK; - return hpa; -} - struct page *gva_to_page(struct kvm_vcpu *vcpu, gva_t gva) { gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, gva); if (gpa == UNMAPPED_GVA) return NULL; - return pfn_to_page(gpa_to_hpa(vcpu->kvm, gpa) >> PAGE_SHIFT); + return gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT); } static void nonpaging_new_cr3(struct kvm_vcpu *vcpu) @@ -1611,8 +1598,8 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte, audit_mappings_page(vcpu, ent, va, level - 1); } else { gpa_t gpa = vcpu->mmu.gva_to_gpa(vcpu, va); - hpa_t hpa = gpa_to_hpa(vcpu, gpa); - struct page *page; + struct page *page = gpa_to_page(vcpu, gpa); + hpa_t hpa = page_to_phys(page); if (is_shadow_present_pte(ent) && (ent & PT64_BASE_ADDR_MASK) != hpa) @@ -1625,8 +1612,6 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte, && !is_error_hpa(hpa)) printk(KERN_ERR "audit: (%s) notrap shadow," " valid guest gva %lx\n", audit_msg, va); - page = pfn_to_page((gpa & PT64_BASE_ADDR_MASK) - >> PAGE_SHIFT); kvm_release_page_clean(page); } |