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

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

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: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3d32e4db

arch/x86/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +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));

	ASSERT(!(is_long_mode(vcpu) && !is_pae(vcpu)));



	accessed_dirty = PT_GUEST_ACCESSED_MASK;

	pt_access = pte_access = ACC_ALL;