diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-07-01 14:20:04 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-07-01 14:20:04 +0300 |
| commit | 255006adb3da71bb75c334453786df781b415f54 (patch) | |
| tree | dc9030af6576d97f8b7489310f76e7406dfb4afb /arch/x86/kvm/vmx/capabilities.h | |
| parent | 24975ce8b2f863547d0b79a5a4552d5ea3522a3c (diff) | |
| parent | 0a3869e14d4a5e1016aad6bc6c5b70f82bc0dbbe (diff) | |
| download | linux-255006adb3da71bb75c334453786df781b415f54.tar.xz | |
Merge tag 'kvm-x86-vmx-6.5' of https://github.com/kvm-x86/linux into HEAD
KVM VMX changes for 6.5:
- Fix missing/incorrect #GP checks on ENCLS
- Use standard mmu_notifier hooks for handling APIC access page
- Misc cleanups
Diffstat (limited to 'arch/x86/kvm/vmx/capabilities.h')
| -rw-r--r-- | arch/x86/kvm/vmx/capabilities.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilities.h index 45162c1bcd8f..d0abee35d7ba 100644 --- a/arch/x86/kvm/vmx/capabilities.h +++ b/arch/x86/kvm/vmx/capabilities.h @@ -152,8 +152,8 @@ static inline bool cpu_has_vmx_ept(void) static inline bool vmx_umip_emulated(void) { - return vmcs_config.cpu_based_2nd_exec_ctrl & - SECONDARY_EXEC_DESC; + return !boot_cpu_has(X86_FEATURE_UMIP) && + (vmcs_config.cpu_based_2nd_exec_ctrl & SECONDARY_EXEC_DESC); } static inline bool cpu_has_vmx_rdtscp(void) |