KVM: VMX: Rename IA32_FEATURE_CONTROL bits
PATCH 2/3 KVM: VMX: Rename IA32_FEATURE_CONTROL bits
Signed-off-by Sheng Yang <[email protected]>
--- arch/x86/kvm/vmx.c | 18 +++++++++--------- arch/x86/kvm/vmx.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/kvm/vmx.c +9 -9
@@ -1041,9 +1041,9 @@ static __init int vmx_disabled_by_bios(void)u64 msr;rdmsrl (MSR_IA32_FEATURE_CONTROL , msr); -return (msr & (IA32_FEATURE_CONTROL_LOCKED_BIT | -IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT )) - ==IA32_FEATURE_CONTROL_LOCKED_BIT ; +return (msr & (FEATURE_CONTROL_LOCKED | +FEATURE_CONTROL_VMXON_ENABLED )) + ==FEATURE_CONTROL_LOCKED ;/* locked but not enabled */ }
@@ -1055,14 +1055,14 @@ static void hardware_enable(void *garbage)INIT_LIST_HEAD (&per_cpu (vcpus_on_cpu, cpu));rdmsrl (MSR_IA32_FEATURE_CONTROL , old); -if ((old & (IA32_FEATURE_CONTROL_LOCKED_BIT | -IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT )) - != (IA32_FEATURE_CONTROL_LOCKED_BIT | -IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT )) +if ((old & (FEATURE_CONTROL_LOCKED | +FEATURE_CONTROL_VMXON_ENABLED )) + != (FEATURE_CONTROL_LOCKED | +FEATURE_CONTROL_VMXON_ENABLED ))/* enable and lock */ wrmsrl (MSR_IA32_FEATURE_CONTROL , old | -IA32_FEATURE_CONTROL_LOCKED_BIT | -IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT ); +FEATURE_CONTROL_LOCKED | +FEATURE_CONTROL_VMXON_ENABLED );write_cr4 (read_cr4 () |X86_CR4_VMXE );/* FIXME: not cpu hotplug safe */ asmvolatile (ASM_VMX_VMXON_RAX : : "a"(&phys_addr), "m"(phys_addr)
arch/x86/kvm/vmx.h +2 -2
@@ -331,8 +331,8 @@ enum vmcs_field {#define AR_RESERVD_MASK 0xfffe0f00 -#define IA32_FEATURE_CONTROL_LOCKED_BIT 0x1 -#define IA32_FEATURE_CONTROL_VMXON_ENABLED_BIT 0x4 +#define FEATURE_CONTROL_LOCKED (1<<0) +#define FEATURE_CONTROL_VMXON_ENABLED (1<<2)#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10
Signature · 1 line
1.5.4.5