diff options
| author | Nadav Amit <namit@cs.technion.ac.il> | 2014-09-30 20:49:18 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-10-24 13:30:37 +0200 |
| commit | 1715d0dcb0d4231983f1580e265c748cd3371f55 (patch) | |
| tree | e3778bc2092b50269a0f8ad68759068ae48a8b77 | |
| parent | 3d32e4dbe71374a6780eaf51d719d76f9a9bf22f (diff) | |
| download | op-kernel-dev-1715d0dcb0d4231983f1580e265c748cd3371f55.zip op-kernel-dev-1715d0dcb0d4231983f1580e265c748cd3371f55.tar.gz | |
KVM: x86: Wrong assertion on paging_tmpl.h
Even after the recent fix, the assertion on paging_tmpl.h is triggered.
Apparently, the assertion wants to check that the PAE is always set on
long-mode, but does it in incorrect way. Note that the assertion is not
enabled unless the code is debugged by defining MMU_DEBUG.
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 806d58e..fd49c86 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -298,7 +298,7 @@ retry_walk: } #endif walker->max_level = walker->level; - ASSERT(!is_long_mode(vcpu) && is_pae(vcpu)); + ASSERT(!(is_long_mode(vcpu) && !is_pae(vcpu))); accessed_dirty = PT_GUEST_ACCESSED_MASK; pt_access = pte_access = ACC_ALL; |
