From d78e45ecb2a46d171ff39cd686ac0c77e7824602 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 5 Jan 2007 16:36:39 -0800 Subject: [PATCH] --- yaml --- r: 45255 b: refs/heads/master c: 6bcbd6aba00fced696fc99f1a4fcd7ac7d42d6ef h: refs/heads/master i: 45253: d9007aed7d3eb9f6184e54f7527537cfecdb78f3 45251: c2c3b5aa3526d7c3398cb526e89595bcf276300e 45247: 547849a28897a09824bd27b7d688123f27f3a7e9 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/paging_tmpl.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dcd962cafd1a..9b7f9abfc8b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd4a4e5374110444dc38831af517e51ff5a053c3 +refs/heads/master: 6bcbd6aba00fced696fc99f1a4fcd7ac7d42d6ef diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h index 8c48528a6e89..3a35c8067dec 100644 --- a/trunk/drivers/kvm/paging_tmpl.h +++ b/trunk/drivers/kvm/paging_tmpl.h @@ -52,6 +52,7 @@ */ struct guest_walker { int level; + gfn_t table_gfn; pt_element_t *table; pt_element_t inherited_ar; }; @@ -63,8 +64,8 @@ static void FNAME(init_walker)(struct guest_walker *walker, struct kvm_memory_slot *slot; walker->level = vcpu->mmu.root_level; - slot = gfn_to_memslot(vcpu->kvm, - (vcpu->cr3 & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT); + walker->table_gfn = (vcpu->cr3 & PT64_BASE_ADDR_MASK) >> PAGE_SHIFT; + slot = gfn_to_memslot(vcpu->kvm, walker->table_gfn); hpa = safe_gpa_to_hpa(vcpu, vcpu->cr3 & PT64_BASE_ADDR_MASK); walker->table = kmap_atomic(pfn_to_page(hpa >> PAGE_SHIFT), KM_USER0); @@ -133,6 +134,8 @@ static pt_element_t *FNAME(fetch_guest)(struct kvm_vcpu *vcpu, return &walker->table[index]; if (walker->level != 3 || is_long_mode(vcpu)) walker->inherited_ar &= walker->table[index]; + walker->table_gfn = (walker->table[index] & PT_BASE_ADDR_MASK) + >> PAGE_SHIFT; paddr = safe_gpa_to_hpa(vcpu, walker->table[index] & PT_BASE_ADDR_MASK); kunmap_atomic(walker->table, KM_USER0); walker->table = kmap_atomic(pfn_to_page(paddr >> PAGE_SHIFT),