Skip to content

Commit

Permalink
KVM: x86: Wrong assertion on paging_tmpl.h
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
anadav authored and bonzini committed Oct 24, 2014
1 parent 3d32e4d commit 1715d0d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kvm/paging_tmpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1715d0d

Please sign in to comment.