Remove the unnecessary cpu_has_vmx_desc() check for emulating UMIP.
When it arrives vmx_set_cr4(), it has passed kvm_is_valid_cr4(), meaning
vmx_set_cpu_caps() has already assign X86_FEATURE_UMIP with this vcpu,
because of either host CPU has the capability or it can be emulated,
vmx_set_cpu_caps():
if (cpu_has_vmx_desc())
kvm_cpu_cap_set(X86_FEATURE_UMIP);
that is to say, if !boot_cpu_has(X86_FEATURE_UMIP) here,
cpu_has_vmx_desc() must be true, it should be a meaningless check here.
Signed-off-by: Robert Hoo <robert.hu@xxxxxxxxx>
---
arch/x86/kvm/vmx/vmx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 96f7c9f37afd..bec5792acffe 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -3437,7 +3437,7 @@ void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
* guest been exposed with UMIP feature, i.e. either host has cap
* of UMIP or vmx_set_cpu_caps() set it because of cpu_has_vmx_desc()
*/
- if (!boot_cpu_has(X86_FEATURE_UMIP) && cpu_has_vmx_desc()) {
+ if (!boot_cpu_has(X86_FEATURE_UMIP)) {
if (cr4 & X86_CR4_UMIP) {
secondary_exec_controls_setbit(vmx, SECONDARY_EXEC_DESC);
hw_cr4 &= ~X86_CR4_UMIP;
--
2.31.1
