diff options
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 7041cc52b562..81dac721ec31 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -1031,9 +1031,9 @@ static __init int vmx_disabled_by_bios(void) | |||
| 1031 | u64 msr; | 1031 | u64 msr; |
| 1032 | 1032 | ||
| 1033 | rdmsrl(MSR_IA32_FEATURE_CONTROL, msr); | 1033 | rdmsrl(MSR_IA32_FEATURE_CONTROL, msr); |
| 1034 | return (msr & (MSR_IA32_FEATURE_CONTROL_LOCKED | | 1034 | return (msr & (IA32_FEATURE_CONTROL_LOCKED_BIT | |
| 1035 | MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) | 1035 | IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) |
| 1036 | == MSR_IA32_FEATURE_CONTROL_LOCKED; | 1036 | == IA32_FEATURE_CONTROL_LOCKED_BIT; |
| 1037 | /* locked but not enabled */ | 1037 | /* locked but not enabled */ |
| 1038 | } | 1038 | } |
| 1039 | 1039 | ||
| @@ -1045,14 +1045,14 @@ static void hardware_enable(void *garbage) | |||
| 1045 | 1045 | ||
| 1046 | INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); | 1046 | INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); |
| 1047 | rdmsrl(MSR_IA32_FEATURE_CONTROL, old); | 1047 | rdmsrl(MSR_IA32_FEATURE_CONTROL, old); |
| 1048 | if ((old & (MSR_IA32_FEATURE_CONTROL_LOCKED | | 1048 | if ((old & (IA32_FEATURE_CONTROL_LOCKED_BIT | |
| 1049 | MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) | 1049 | IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) |
| 1050 | != (MSR_IA32_FEATURE_CONTROL_LOCKED | | 1050 | != (IA32_FEATURE_CONTROL_LOCKED_BIT | |
| 1051 | MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) | 1051 | IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT)) |
| 1052 | /* enable and lock */ | 1052 | /* enable and lock */ |
| 1053 | wrmsrl(MSR_IA32_FEATURE_CONTROL, old | | 1053 | wrmsrl(MSR_IA32_FEATURE_CONTROL, old | |
| 1054 | MSR_IA32_FEATURE_CONTROL_LOCKED | | 1054 | IA32_FEATURE_CONTROL_LOCKED_BIT | |
| 1055 | MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED); | 1055 | IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT); |
| 1056 | write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */ | 1056 | write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */ |
| 1057 | asm volatile (ASM_VMX_VMXON_RAX | 1057 | asm volatile (ASM_VMX_VMXON_RAX |
| 1058 | : : "a"(&phys_addr), "m"(phys_addr) | 1058 | : : "a"(&phys_addr), "m"(phys_addr) |