KVM: x86: Use kvm_cpu_caps to detect Intel PT support (dd69cc25) · Commits · 戴 / test

Check for Intel PT using kvm_cpu_cap_has() to pave the way toward eliminating ->pt_supported(). No functional change intended. Reviewed-by:

arch/x86/kvm/cpuid.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}