|
@@ -946,7 +946,7 @@ static void pte_list_walk(unsigned long *pte_list, pte_list_walk_fn fn)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static unsigned long *__gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level,
|
|
|
+static unsigned long *__gfn_to_rmap(gfn_t gfn, int level,
|
|
|
struct kvm_memory_slot *slot)
|
|
|
{
|
|
|
struct kvm_lpage_info *linfo;
|
|
@@ -966,7 +966,7 @@ static unsigned long *gfn_to_rmap(struct kvm *kvm, gfn_t gfn, int level)
|
|
|
struct kvm_memory_slot *slot;
|
|
|
|
|
|
slot = gfn_to_memslot(kvm, gfn);
|
|
|
- return __gfn_to_rmap(kvm, gfn, level, slot);
|
|
|
+ return __gfn_to_rmap(gfn, level, slot);
|
|
|
}
|
|
|
|
|
|
static bool rmap_can_add(struct kvm_vcpu *vcpu)
|
|
@@ -1018,7 +1018,7 @@ int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn,
|
|
|
u64 *spte;
|
|
|
int i, write_protected = 0;
|
|
|
|
|
|
- rmapp = __gfn_to_rmap(kvm, gfn, PT_PAGE_TABLE_LEVEL, slot);
|
|
|
+ rmapp = __gfn_to_rmap(gfn, PT_PAGE_TABLE_LEVEL, slot);
|
|
|
spte = rmap_next(kvm, rmapp, NULL);
|
|
|
while (spte) {
|
|
|
BUG_ON(!(*spte & PT_PRESENT_MASK));
|
|
@@ -1033,7 +1033,7 @@ int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn,
|
|
|
/* check for huge page mappings */
|
|
|
for (i = PT_DIRECTORY_LEVEL;
|
|
|
i < PT_PAGE_TABLE_LEVEL + KVM_NR_PAGE_SIZES; ++i) {
|
|
|
- rmapp = __gfn_to_rmap(kvm, gfn, i, slot);
|
|
|
+ rmapp = __gfn_to_rmap(gfn, i, slot);
|
|
|
spte = rmap_next(kvm, rmapp, NULL);
|
|
|
while (spte) {
|
|
|
BUG_ON(!(*spte & PT_PRESENT_MASK));
|