kvm: rename pfn_t to kvm_pfn_t

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kvm / mmu_audit.c

diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c
index 03d518e499a6d5a6184b19ae86b70adfcb3955ba..dcce533d420c384f2081ab9197f3c4fa50cb8352 100644 (file)
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -97,7 +97,7 @@ static void audit_mappings(struct kvm_vcpu *vcpu, u64 *sptep, int level)
 {
        struct kvm_mmu_page *sp;
        gfn_t gfn;
-       pfn_t pfn;
+       kvm_pfn_t pfn;
        hpa_t hpa;
 
        sp = page_header(__pa(sptep));
@@ -129,7 +129,7 @@ static void audit_mappings(struct kvm_vcpu *vcpu, u64 *sptep, int level)
 static void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep)
 {
        static DEFINE_RATELIMIT_STATE(ratelimit_state, 5 * HZ, 10);
-       unsigned long *rmapp;
+       struct kvm_rmap_head *rmap_head;
        struct kvm_mmu_page *rev_sp;
        struct kvm_memslots *slots;
        struct kvm_memory_slot *slot;
@@ -150,8 +150,8 @@ static void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep)
                return;
        }
 
-       rmapp = __gfn_to_rmap(gfn, rev_sp->role.level, slot);
-       if (!*rmapp) {
+       rmap_head = __gfn_to_rmap(gfn, rev_sp->role.level, slot);
+       if (!rmap_head->val) {
                if (!__ratelimit(&ratelimit_state))
                        return;
                audit_printk(kvm, "no rmap for writable spte %llx\n",
@@ -183,7 +183,7 @@ static void check_mappings_rmap(struct kvm *kvm, struct kvm_mmu_page *sp)
                return;
 
        for (i = 0; i < PT64_ENT_PER_PAGE; ++i) {
-               if (!is_rmap_spte(sp->spt[i]))
+               if (!is_shadow_present_pte(sp->spt[i]))
                        continue;
 
                inspect_spte_has_rmap(kvm, sp->spt + i);
@@ -192,7 +192,7 @@ static void check_mappings_rmap(struct kvm *kvm, struct kvm_mmu_page *sp)
 
 static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp)
 {
-       unsigned long *rmapp;
+       struct kvm_rmap_head *rmap_head;
        u64 *sptep;
        struct rmap_iterator iter;
        struct kvm_memslots *slots;
@@ -203,13 +203,14 @@ static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp)
 
        slots = kvm_memslots_for_spte_role(kvm, sp->role);
        slot = __gfn_to_memslot(slots, sp->gfn);
-       rmapp = __gfn_to_rmap(sp->gfn, PT_PAGE_TABLE_LEVEL, slot);
+       rmap_head = __gfn_to_rmap(sp->gfn, PT_PAGE_TABLE_LEVEL, slot);
 
-       for_each_rmap_spte(rmapp, &iter, sptep)
+       for_each_rmap_spte(rmap_head, &iter, sptep) {
                if (is_writable_pte(*sptep))
                        audit_printk(kvm, "shadow page has writable "
                                     "mappings: gfn %llx role %x\n",
                                     sp->gfn, sp->role.word);
+       }
 }
 
 static void audit_sp(struct kvm *kvm, struct kvm_mmu_page *sp)