From 395174f9db66bd78b0e53f24905c2de2461e358d Mon Sep 17 00:00:00 2001 From: Mingqiang Chi Date: Thu, 2 Dec 2021 15:40:06 +0800 Subject: [PATCH] hv:remove 2 bits vmx capability check for VMX_PROCBASED_CTLS2_XSVE_XRSTR, it has been checked in is_valid_xsave_combination, here remove the redundant check. for VMX_PROCBASED_CTLS2_PAUSE_LOOP, now it will panic if run ACRN over QEMU, here remove it from essential check, and it will print error information when set this bit if there is no the hardware capability. Tracked-On: #6584 Signed-off-by: Mingqiang Chi --- hypervisor/arch/x86/cpu_caps.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hypervisor/arch/x86/cpu_caps.c b/hypervisor/arch/x86/cpu_caps.c index f6e80b20f..e4251e8ed 100644 --- a/hypervisor/arch/x86/cpu_caps.c +++ b/hypervisor/arch/x86/cpu_caps.c @@ -65,8 +65,7 @@ static struct vmx_capability vmx_caps[] = { { MSR_IA32_VMX_PROCBASED_CTLS2, VMX_PROCBASED_CTLS2_VAPIC | VMX_PROCBASED_CTLS2_EPT | VMX_PROCBASED_CTLS2_VPID | VMX_PROCBASED_CTLS2_RDTSCP | - VMX_PROCBASED_CTLS2_UNRESTRICT | VMX_PROCBASED_CTLS2_XSVE_XRSTR | - VMX_PROCBASED_CTLS2_PAUSE_LOOP + VMX_PROCBASED_CTLS2_UNRESTRICT }, { MSR_IA32_VMX_EXIT_CTLS, VMX_EXIT_CTLS_ACK_IRQ | VMX_EXIT_CTLS_SAVE_PAT |