From: Nadav Amit Date: Tue, 30 Sep 2014 17:49:18 +0000 (+0300) Subject: KVM: x86: Wrong assertion on paging_tmpl.h X-Git-Tag: MMI-PSA29.97-13-9~11278^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1715d0dcb0d4231983f1580e265c748cd3371f55;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 806d58e3c320..fd49c867b25a 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;