KVM: x86: Use kvm_cpu_caps to detect Intel PT support

Check for Intel PT using kvm_cpu_cap_has() to pave the way toward
eliminating ->pt_supported().

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>

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index dedf30fedbcb5d02dee4eb764c04565fc564cb24..214bcb3a5c1e9b82e8245992f8f66376ca3bd276 100644 (file)
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -504,7 +504,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
 {
        struct kvm_cpuid_entry2 *entry;
        int r, i, max_idx;
-       unsigned f_intel_pt = kvm_x86_ops->pt_supported() ? F(INTEL_PT) : 0;
 
        /* all calls to cpuid_count() should be made on the same cpu */
        get_cpu();
@@ -675,7 +674,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
                break;
        /* Intel PT */
        case 0x14:
-               if (!f_intel_pt) {
+               if (!kvm_cpu_cap_has(X86_FEATURE_INTEL_PT)) {
                        entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
                        break;
                }