summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorBandan Das2016-07-13 00:18:50 +0200
committerPaolo Bonzini2016-07-14 09:02:47 +0200
commit812f30b234539ccb0139f92dfdbec1e8158cf535 (patch)
tree34af341c89d7de276002d344a3482fa944c74675 /arch/x86/kvm/x86.c
parentkvm: mmu: extend the is_present check to 32 bits (diff)
downloadkernel-qcow2-linux-812f30b234539ccb0139f92dfdbec1e8158cf535.tar.gz
kernel-qcow2-linux-812f30b234539ccb0139f92dfdbec1e8158cf535.tar.xz
kernel-qcow2-linux-812f30b234539ccb0139f92dfdbec1e8158cf535.zip
kvm: mmu: remove is_present_gpte()
We have two versions of the above function. To prevent confusion and bugs in the future, remove the non-FNAME version entirely and replace all calls with the actual check. Signed-off-by: Bandan Das <bsd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 0cc6cf834cdd..bb6e8bfaee3b 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -540,7 +540,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3)
goto out;
}
for (i = 0; i < ARRAY_SIZE(pdpte); ++i) {
- if (is_present_gpte(pdpte[i]) &&
+ if ((pdpte[i] & PT_PRESENT_MASK) &&
(pdpte[i] &
vcpu->arch.mmu.guest_rsvd_check.rsvd_bits_mask[0][2])) {
ret = 0;