Commit bfdc0c28 authored Dec 13, 2006 by Avi Kivity Committed by Linus Torvalds Dec 13, 2006

[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>

parent 3b99ab24

drivers/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message