Sorry I will pay more attention to the surrounding code in future.
________________________________
From: Andrew Cooper <[email protected]>
Sent: 24 November 2025 8:44 PM
To: Kevin Lampis <[email protected]>; [email protected]
<[email protected]>
Cc: [email protected] <[email protected]>; Roger Pau Monne
<[email protected]>
Subject: Re: [PATCH] x86: Remove x86 prefixed names from cpuinfo for intel.c
On 24/11/2025 11:19 am, Kevin Lampis wrote:
> diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
> index 6f71365b7e..5f780fe1aa 100644
> --- a/xen/arch/x86/cpu/intel.c
> +++ b/xen/arch/x86/cpu/intel.c
> @@ -86,7 +86,7 @@ static void __init check_memory_type_self_snoop_errata(void)
> if (!boot_cpu_has(X86_FEATURE_SS))
> return;
>
> - switch (boot_cpu_data.x86_model) {
> + switch (boot_cpu_data.model) {
> case 0x0f: /* Merom */
> case 0x16: /* Merom L */
> case 0x17: /* Penryn */
One of the reasons of making these changes is identify the places
needing converting to VFM. This is one, and...
> @@ -137,10 +137,10 @@ static void __init probe_masking_msrs(void)
> unsigned int exp_msr_basic, exp_msr_ext, exp_msr_xsave;
>
> /* Only family 6 supports this feature. */
> - if (c->x86 != 6)
> + if (c->family != 6)
> return;
>
> - switch (c->x86_model) {
> + switch (c->model) {
... so is this.
~Andrew
