[PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits
Commit 346874c9507a (KVM: x86: Fix CR3 reserved bits) removed non-PAE reserved bits which were not according to Intel SDM. However, residue was left in a debug assertion (CR3_NONPAE_RESERVED_BITS). Remove it. Signed-off-by: Nadav Amit na...@cs.technion.ac.il --- arch/x86/kvm/paging_tmpl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 0ab6c65..806d58e 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -298,8 +298,7 @@ retry_walk: } #endif walker-max_level = walker-level; - ASSERT((!is_long_mode(vcpu) is_pae(vcpu)) || - (mmu-get_cr3(vcpu) CR3_NONPAE_RESERVED_BITS) == 0); + ASSERT(!is_long_mode(vcpu) is_pae(vcpu)); accessed_dirty = PT_GUEST_ACCESSED_MASK; pt_access = pte_access = ACC_ALL; -- 1.9.1 -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits
Il 23/09/2014 09:01, Nadav Amit ha scritto: Commit 346874c9507a (KVM: x86: Fix CR3 reserved bits) removed non-PAE reserved bits which were not according to Intel SDM. However, residue was left in a debug assertion (CR3_NONPAE_RESERVED_BITS). Remove it. Signed-off-by: Nadav Amit na...@cs.technion.ac.il --- arch/x86/kvm/paging_tmpl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 0ab6c65..806d58e 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -298,8 +298,7 @@ retry_walk: } #endif walker-max_level = walker-level; - ASSERT((!is_long_mode(vcpu) is_pae(vcpu)) || -(mmu-get_cr3(vcpu) CR3_NONPAE_RESERVED_BITS) == 0); + ASSERT(!is_long_mode(vcpu) is_pae(vcpu)); accessed_dirty = PT_GUEST_ACCESSED_MASK; pt_access = pte_access = ACC_ALL; Thanks, applied. Paolo -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
