Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit defed7ed authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

x86: Move FEATURE_CONTROL bits to msr-index.h 



For MSR_IA32_FEATURE_CONTROL is already there.

Signed-off-by: default avatarSheng Yang <sheng.yang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 9ea542fa

arch/x86/kvm/vmx.h

+0 −3
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ enum vmcs_field { 


#define AR_RESERVD_MASK 0xfffe0f00



#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

include/asm-x86/msr-index.h

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ 
#define MSR_IA32_EBL_CR_POWERON		0x0000002a

#define MSR_IA32_FEATURE_CONTROL        0x0000003a



#define FEATURE_CONTROL_LOCKED		(1<<0)

#define FEATURE_CONTROL_VMXON_ENABLED	(1<<2)



#define MSR_IA32_APICBASE		0x0000001b

#define MSR_IA32_APICBASE_BSP		(1<<8)

#define MSR_IA32_APICBASE_ENABLE	(1<<11)