forked from luck/tmp_suning_uos_patched
[PATCH] KVM: Fix vmx hardware_enable() on macbooks
It seems macbooks set bit 2 but not bit 0, which is an "enabled but vmxon will fault" setting. Signed-off-by: Avi Kivity <avi@qumranet.com> Tested-by: Alex Larsson (sometimes testing helps) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
3b99ab2421
commit
bfdc0c280a
|
@ -534,7 +534,7 @@ static __init void hardware_enable(void *garbage)
|
|||
u64 old;
|
||||
|
||||
rdmsrl(MSR_IA32_FEATURE_CONTROL, old);
|
||||
if ((old & 5) == 0)
|
||||
if ((old & 5) != 5)
|
||||
/* enable and lock */
|
||||
wrmsrl(MSR_IA32_FEATURE_CONTROL, old | 5);
|
||||
write_cr4(read_cr4() | CR4_VMXE); /* FIXME: not cpu hotplug safe */
|
||||
|
|
Loading…
Reference in New Issue
Block a user