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: Jim Mattson <jmattson@google.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220830133737.1539624-29-vkuznets@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 7bc644e206d923cf69c3eb7695c740040b9580dc..38bf89088acb975ec5f41d21b9b24907e6c4cedf 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -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 "