aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kvm/cpuid.h
diff options
context:
space:
mode:
authorGravatar Sean Christopherson <sean.j.christopherson@intel.com> 2020-03-02 15:56:45 -0800
committerGravatar Paolo Bonzini <pbonzini@redhat.com> 2020-03-16 17:58:26 +0100
commit8721f5b061eb18c4bb3b77be3ec1c2811ca574ba (patch)
tree2e0363a7d843b6fd48b2ae8441cbeacc65620d7d /arch/x86/kvm/cpuid.h
parentKVM: x86: Move XSAVES CPUID adjust to VMX's KVM cpu cap update (diff)
downloadlinux-8721f5b061eb18c4bb3b77be3ec1c2811ca574ba.tar.gz
linux-8721f5b061eb18c4bb3b77be3ec1c2811ca574ba.tar.bz2
linux-8721f5b061eb18c4bb3b77be3ec1c2811ca574ba.zip
KVM: x86: Add a helper to check kernel support when setting cpu cap
Add a helper, kvm_cpu_cap_check_and_set(), to query boot_cpu_has() as part of setting a KVM cpu capability. VMX in particular has a number of features that are dependent on both a VMCS capability and kernel support. No functional change intended. Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/cpuid.h')
-rw-r--r--arch/x86/kvm/cpuid.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
index 13374f885c81..fd29b646916a 100644
--- a/arch/x86/kvm/cpuid.h
+++ b/arch/x86/kvm/cpuid.h
@@ -282,4 +282,10 @@ static __always_inline void kvm_cpu_cap_set(unsigned int x86_feature)
kvm_cpu_caps[x86_leaf] |= __feature_bit(x86_feature);
}
+static __always_inline void kvm_cpu_cap_check_and_set(unsigned int x86_feature)
+{
+ if (boot_cpu_has(x86_feature))
+ kvm_cpu_cap_set(x86_feature);
+}
+
#endif