diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-10-04 12:29:08 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-10-04 12:29:08 +0200 |
| commit | 1332d0e907fd5b6075241d36257f8faef5ec97a7 (patch) | |
| tree | c6cbe04d13373ab8e6366ba39ab3f294bf0eebd9 /xen/include | |
| parent | 190b667ac20e8175758f4a3a0f13c4d990e6af7e (diff) | |
| download | xen-1332d0e907fd5b6075241d36257f8faef5ec97a7.tar.gz xen-1332d0e907fd5b6075241d36257f8faef5ec97a7.tar.bz2 xen-1332d0e907fd5b6075241d36257f8faef5ec97a7.zip | |
VMX: clean up capability checks
VMCS size validation on APs should check against BP's size.
No need for a separate cpu_has_vmx_ins_outs_instr_info variable
anymore.
Use proper symbolics.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Jun Nakajima <jun.nakajima@intel.com>
Diffstat (limited to 'xen/include')
| -rw-r--r-- | xen/include/asm-x86/hvm/vmx/vmcs.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 8c123c7655..b50352f673 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -210,8 +210,6 @@ extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_ENABLE_VMCS_SHADOWING 0x00004000 extern u32 vmx_secondary_exec_control; -extern bool_t cpu_has_vmx_ins_outs_instr_info; - #define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001 #define VMX_EPT_WALK_LENGTH_4_SUPPORTED 0x00000040 #define VMX_EPT_MEMORY_TYPE_UC 0x00000100 @@ -278,6 +276,12 @@ extern bool_t cpu_has_vmx_ins_outs_instr_info; #define VMX_INTR_SHADOW_SMI 0x00000004 #define VMX_INTR_SHADOW_NMI 0x00000008 +#define VMX_BASIC_REVISION_MASK 0x7fffffff +#define VMX_BASIC_VMCS_SIZE_MASK (0x1fffULL << 32) +#define VMX_BASIC_32BIT_ADDRESSES (1ULL << 48) +#define VMX_BASIC_DUAL_MONITOR (1ULL << 49) +#define VMX_BASIC_MEMORY_TYPE_MASK (0xfULL << 50) +#define VMX_BASIC_INS_OUT_INFO (1ULL << 54) /* * bit 55 of IA32_VMX_BASIC MSR, indicating whether any VMX controls that * default to 1 may be cleared to 0. @@ -285,6 +289,8 @@ extern bool_t cpu_has_vmx_ins_outs_instr_info; #define VMX_BASIC_DEFAULT1_ZERO (1ULL << 55) extern u64 vmx_basic_msr; +#define cpu_has_vmx_ins_outs_instr_info \ + (!!(vmx_basic_msr & VMX_BASIC_INS_OUT_INFO)) /* Guest interrupt status */ #define VMX_GUEST_INTR_STATUS_SUBFIELD_BITMASK 0x0FF |