From: Xenia Ragiadakou <burzalod...@gmail.com>
To be able to use cpu_has_{svm/vmx}_* macros in common code without enclosing
them inside #ifdef guards when the respective virtualization technology is
not enabled, define corresponding helper routines as false when not applicable.
No functional change intended.
Signed-off-by: Xenia Ragiadakou <burzalod...@gmail.com>
Signed-off-by: Sergiy Kibrik <sergiy_kib...@epam.com>
---
xen/arch/x86/include/asm/hvm/svm/svm.h | 8 ++++++++
xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 7 +++++++
2 files changed, 15 insertions(+)
diff --git a/xen/arch/x86/include/asm/hvm/svm/svm.h
b/xen/arch/x86/include/asm/hvm/svm/svm.h
index 4eeeb25da9..7e8cdb4a27 100644
--- a/xen/arch/x86/include/asm/hvm/svm/svm.h
+++ b/xen/arch/x86/include/asm/hvm/svm/svm.h
@@ -38,10 +38,18 @@ extern u32 svm_feature_flags;
#define SVM_FEATURE_SSS 19 /* NPT Supervisor Shadow Stacks */
#define SVM_FEATURE_SPEC_CTRL 20 /* MSR_SPEC_CTRL virtualisation */
+#ifdef CONFIG_SVM
static inline bool cpu_has_svm_feature(unsigned int feat)
{
return svm_feature_flags & (1u << feat);
}
+#else
+static inline bool cpu_has_svm_feature(unsigned int feat)
+{
+ return false;
+}
+#endif
+
#define cpu_has_svm_npt cpu_has_svm_feature(SVM_FEATURE_NPT)
#define cpu_has_svm_lbrv cpu_has_svm_feature(SVM_FEATURE_LBRV)
#define cpu_has_svm_svml cpu_has_svm_feature(SVM_FEATURE_SVML)
diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
index fd197e2603..2d927d3100 100644
--- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
+++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
@@ -287,10 +287,17 @@ extern uint64_t vmx_tertiary_exec_control;
#define VMX_VPID_INVVPID_SINGLE_CONTEXT_RETAINING_GLOBAL 0x80000000000ULL
extern u64 vmx_ept_vpid_cap;
+#ifdef CONFIG_VMX
static inline bool vmx_ctrl_has_feature(uint64_t control, unsigned long
feature)
{
return control & feature;
}
+#else
+static inline bool vmx_ctrl_has_feature(uint64_t control, unsigned long
feature)
+{
+ return false;
+}
+#endif
#define VMX_MISC_ACTIVITY_MASK 0x000001c0
#define VMX_MISC_PROC_TRACE 0x00004000
--
2.25.1
