From b2a856d99281f2fee60a4313d204205bcd2c4269 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Wed, 1 May 2013 17:30:51 +0200 Subject: [PATCH] target-i386: Change CPUID model of 486 to 8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 [AF: Add compat_props entry] Tested-by: Eduardo Habkost Reviewed-by: Eduardo Habkost Signed-off-by: Andreas Färber --- 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 41869e56e9..417afe4ef0 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 b43847835b..8e21c94d82 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -588,7 +588,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 1, .vendor = CPUID_VENDOR_INTEL, .family = 4, - .model = 0, + .model = 8, .stepping = 0, .features[FEAT_1_EDX] = I486_FEATURES, -- 2.11.4.GIT