* [PATCH] KVM: x86: VMX: Replace some Intel model numbers with mnemonics
@ 2022-06-29 22:22 Jim Mattson
2022-07-08 0:13 ` Sean Christopherson
0 siblings, 1 reply; 2+ messages in thread
From: Jim Mattson @ 2022-06-29 22:22 UTC (permalink / raw)
To: kvm, pbonzini; +Cc: Jim Mattson
Intel processor code names are more familiar to many readers than
their decimal model numbers.
Signed-off-by: Jim Mattson <jmattson@google.com>
---
arch/x86/kvm/vmx/vmx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index c30115b9cb33..1e3ab13bc17d 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -2645,11 +2645,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 "
--
2.37.0.rc0.161.g10f37bed90-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: x86: VMX: Replace some Intel model numbers with mnemonics
2022-06-29 22:22 [PATCH] KVM: x86: VMX: Replace some Intel model numbers with mnemonics Jim Mattson
@ 2022-07-08 0:13 ` Sean Christopherson
0 siblings, 0 replies; 2+ messages in thread
From: Sean Christopherson @ 2022-07-08 0:13 UTC (permalink / raw)
To: Jim Mattson; +Cc: kvm, pbonzini, Vitaly Kuznetsov
+Vitaly (if you want to carry my R-b in your series)
On Wed, Jun 29, 2022, Jim Mattson wrote:
> 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>
> arch/x86/kvm/vmx/vmx.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index c30115b9cb33..1e3ab13bc17d 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -2645,11 +2645,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 */
Thanks for the opportunity to test my hex=>decimal abilities ;-)
> _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 "
> --
> 2.37.0.rc0.161.g10f37bed90-goog
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-08 0:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-29 22:22 [PATCH] KVM: x86: VMX: Replace some Intel model numbers with mnemonics Jim Mattson
2022-07-08 0:13 ` Sean Christopherson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).