diff options
| author | Avi Kivity <avi@qumranet.com> | 2006-12-13 00:34:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:48 -0800 |
| commit | bfdc0c280a497575670e87efa89e78a88438483b (patch) | |
| tree | 6c7a3ee533f9f163393e61efa3e57e3e72bddf82 /drivers | |
| parent | 3b99ab242145c99ec8781dc267ec100e7f23ef9d (diff) | |
| download | linux-3.10-bfdc0c280a497575670e87efa89e78a88438483b.tar.gz linux-3.10-bfdc0c280a497575670e87efa89e78a88438483b.tar.bz2 linux-3.10-bfdc0c280a497575670e87efa89e78a88438483b.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index ea3bdbb0da9..f0f0b1a781f 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -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 */ |