Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5262739 authored by Nadav Amit's avatar Nadav Amit Committed by Paolo Bonzini
Browse files

KVM: x86: Remove debug assertion of non-PAE reserved bits 



Commit 346874c9 ("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: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2ea75be3

arch/x86/kvm/paging_tmpl.h

+1 −2
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 
	}

#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;