Re: [Qemu-devel] [PATCH qom-cpu for-1.5 4/4] target-i386: Change CPUID model of 486 to 8

[Eduardo Habkost]

On Wed, May 01, 2013 at 06:07:20PM +0200, Andreas Färber wrote:
> This changes the model number of 486 to 8 (DX4) which matches the
> feature set presented, and actually has the CPUID instruction.
> 
> This adds a compatibility property, to keep model=0 on pc-*-1.4 and older.
> 
> Signed-off-by: H. Peter Anvin <address@hidden>
> Cc: Eduardo Habkost <address@hidden>
> [AF: Add compat_props entry]
> Signed-off-by: Andreas Färber <address@hidden>

Tested by running a simple CPUID-dump test kernel, CPUID data is
changing according to the machine-type as expected. Didn't test using a
Linux kernel.

Tested-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


> ---
>  include/hw/i386/pc.h | 4 ++++
>  target-i386/cpu.c    | 2 +-
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 41869e5..417afe4 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -242,6 +242,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>              .driver   = "pc-sysfw",\
>              .property = "rom_only",\
>              .value    = stringify(0),\
> +        },{\
> +            .driver   = "486-" TYPE_X86_CPU,\
> +            .property = "model",\
> +            .value    = stringify(0),\
>          }
>  
>  #endif
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 8a9563b..f7d4d9b 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -550,7 +550,7 @@ static x86_def_t builtin_x86_defs[] = {
>          .level = 1,
>          .vendor = CPUID_VENDOR_INTEL,
>          .family = 4,
> -        .model = 0,
> +        .model = 8,
>          .stepping = 0,
>          .features = I486_FEATURES,
>          .xlevel = 0,
> -- 
> 1.8.1.4
> 

-- 
Eduardo