diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-01 17:30:51 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-05-06 19:55:18 +0200 |
| commit | b2a856d99281f2fee60a4313d204205bcd2c4269 (patch) | |
| tree | 02363566ba4cdb255fa37de89accbc1e9b3aec01 | |
| parent | ba2bc7a42e7c7b343f996967484ce3a1543cfebc (diff) | |
target-i386: Change CPUID model of 486 to 8
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 <hpa@zytor.com>
[AF: Add compat_props entry]
Tested-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | include/hw/i386/pc.h | 4 | ||||
| -rw-r--r-- | target-i386/cpu.c | 2 |
2 files changed, 5 insertions, 1 deletions
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, |