[RFC PATCH 11/27] KVM: SVM: Drop unnecessary clears of unsupported common x86 features

[Binbin Wu <binbin.wu@linux.intel.com>]

Remove kvm_cpu_cap_clear() calls for IBT, BUS_LOCK_DETECT, and MSR_IMM
in svm_set_cpu_caps() since they are not set in common code anymore.

Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com>
---
 arch/x86/kvm/svm/svm.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index a21c500e1a91..ab3405640764 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -5445,8 +5445,6 @@ static __init void svm_set_cpu_caps(void)
 
 	kvm_caps.supported_perf_cap = 0;
 
-	kvm_cpu_cap_clear(X86_FEATURE_IBT, F_CPUID_SVM);
-
 	/* CPUID 0x80000001 and 0x8000000A (SVM features) */
 	if (nested) {
 		kvm_cpu_cap_set(X86_FEATURE_SVM, F_CPUID_SVM);
@@ -5517,13 +5515,6 @@ static __init void svm_set_cpu_caps(void)
 	/* CPUID 0x8000001F (SME/SEV features) */
 	sev_set_cpu_caps();
 
-	/*
-	 * Clear capabilities that are automatically configured by common code,
-	 * but that require explicit SVM support (that isn't yet implemented).
-	 */
-	kvm_cpu_cap_clear(X86_FEATURE_BUS_LOCK_DETECT, F_CPUID_SVM);
-	kvm_cpu_cap_clear(X86_FEATURE_MSR_IMM, F_CPUID_SVM);
-
 	kvm_setup_xss_caps();
 	kvm_finalize_cpu_caps();
 }
-- 
2.46.0