Commit aef46a64 authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

KVM: x86: VMX: Replace some Intel model numbers with mnemonics 



Intel processor code names are more familiar to many readers than
their decimal model numbers.

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220830133737.1539624-29-vkuznets@redhat.com


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 64f80ea7

arch/x86/kvm/vmx/vmx.c

+5 −5
Original line number Diff line number Diff line
@@ -2656,11 +2656,11 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
	 */

	if (boot_cpu_data.x86 == 0x6) {

		switch (boot_cpu_data.x86_model) {

		case 26: /* AAK155 */

		case 30: /* AAP115 */

		case 37: /* AAT100 */

		case 44: /* BC86,AAY89,BD102 */

		case 46: /* BA97 */

		case INTEL_FAM6_NEHALEM_EP:	/* AAK155 */

		case INTEL_FAM6_NEHALEM:	/* AAP115 */

		case INTEL_FAM6_WESTMERE:	/* AAT100 */

		case INTEL_FAM6_WESTMERE_EP:	/* BC86,AAY89,BD102 */

		case INTEL_FAM6_NEHALEM_EX:	/* BA97 */

			_vmentry_control &= ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL;

			_vmexit_control &= ~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL;

			pr_warn_once("kvm: VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL "