aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/mmu.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-09-10 11:30:45 -0400
committerAvi Kivity <avi@redhat.com>2010-10-24 04:52:32 -0400
commit3241f22da85d26505b39f525a88f52ebd1235975 (patch)
tree48b98fa9824a6f94cb4fc71d930864fb5f3527d2 /arch/x86/kvm/mmu.c
parent52fde8df7dd13d90f5f8dc43157418bff968d90a (diff)
KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu
This patch changes is_rsvd_bits_set() function prototype to take only a kvm_mmu context instead of a full vcpu. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r--arch/x86/kvm/mmu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 9e48a774fceb..86f7557cf3fb 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2578,12 +2578,12 @@ static void paging_free(struct kvm_vcpu *vcpu)
2578 nonpaging_free(vcpu); 2578 nonpaging_free(vcpu);
2579} 2579}
2580 2580
2581static bool is_rsvd_bits_set(struct kvm_vcpu *vcpu, u64 gpte, int level) 2581static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)
2582{ 2582{
2583 int bit7; 2583 int bit7;
2584 2584
2585 bit7 = (gpte >> 7) & 1; 2585 bit7 = (gpte >> 7) & 1;
2586 return (gpte & vcpu->arch.mmu.rsvd_bits_mask[bit7][level-1]) != 0; 2586 return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0;
2587} 2587}
2588 2588
2589#define PTTYPE 64 2589#define PTTYPE 64
@@ -2859,7 +2859,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
2859 return; 2859 return;
2860 } 2860 }
2861 2861
2862 if (is_rsvd_bits_set(vcpu, *(u64 *)new, PT_PAGE_TABLE_LEVEL)) 2862 if (is_rsvd_bits_set(&vcpu->arch.mmu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))
2863 return; 2863 return;
2864 2864
2865 ++vcpu->kvm->stat.mmu_pte_updated; 2865 ++vcpu->kvm->stat.mmu_pte_updated;