lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: VMX: Rename misnamed msr bits

Browse Source 
MSR_IA32_FEATURE_LOCKED is just a bit in fact, which shouldn't be prefixed with
MSR_.  So is MSR_IA32_FEATURE_VMXON_ENABLED.

Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Sheng Yang
2008-06-24 17:02:38 +08:00
committed by Avi Kivity
parent 278429cff8
commit ca60dfbb69
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kvm/vmx.c
View File

@@ -1031,9 +1031,9 @@ static __init int vmx_disabled_by_bios(void)
u64 msr; u64 msr;
rdmsrl(MSR_IA32_FEATURE_CONTROL, msr); rdmsrl(MSR_IA32_FEATURE_CONTROL, msr);
return (msr & (MSR_IA32_FEATURE_CONTROL_LOCKED | return (msr & (IA32_FEATURE_CONTROL_LOCKED_BIT |
MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT))
== MSR_IA32_FEATURE_CONTROL_LOCKED; == IA32_FEATURE_CONTROL_LOCKED_BIT;
/* locked but not enabled */ /* locked but not enabled */
} }
@@ -1045,14 +1045,14 @@ static void hardware_enable(void *garbage)
INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu)); INIT_LIST_HEAD(&per_cpu(vcpus_on_cpu, cpu));
rdmsrl(MSR_IA32_FEATURE_CONTROL, old); rdmsrl(MSR_IA32_FEATURE_CONTROL, old);
if ((old & (MSR_IA32_FEATURE_CONTROL_LOCKED | if ((old & (IA32_FEATURE_CONTROL_LOCKED_BIT |
MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT))
!= (MSR_IA32_FEATURE_CONTROL_LOCKED | != (IA32_FEATURE_CONTROL_LOCKED_BIT |
MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED)) IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT))
/* enable and lock */ /* enable and lock */
wrmsrl(MSR_IA32_FEATURE_CONTROL, old | wrmsrl(MSR_IA32_FEATURE_CONTROL, old |
MSR_IA32_FEATURE_CONTROL_LOCKED | IA32_FEATURE_CONTROL_LOCKED_BIT |
MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED); IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT);
write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */ write_cr4(read_cr4() | X86_CR4_VMXE); /* FIXME: not cpu hotplug safe */
asm volatile (ASM_VMX_VMXON_RAX asm volatile (ASM_VMX_VMXON_RAX
: : "a"(&phys_addr), "m"(phys_addr) : : "a"(&phys_addr), "m"(phys_addr)

4
arch/x86/kvm/vmx.h
View File

@@ -331,8 +331,8 @@ enum vmcs_field {
#define AR_RESERVD_MASK 0xfffe0f00 #define AR_RESERVD_MASK 0xfffe0f00
#define MSR_IA32_FEATURE_CONTROL_LOCKED 0x1 #define IA32_FEATURE_CONTROL_LOCKED_BIT 0x1
#define MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED 0x4 #define IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT 0x4
#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9
#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10 #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10