[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/11] target-i386: Change CPUID model of 486 to 8
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 09/11] target-i386: Change CPUID model of 486 to 8 |
Date: |
Mon, 6 May 2013 22:43:29 +0200 |
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>
[AF: Add compat_props entry]
Tested-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <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 b438478..8e21c94 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,
--
1.8.1.4
- [Qemu-devel] [PULL for-1.5 00/11] QOM CPUState patch queue 2013-05-06, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 01/11] target-i386: Add ECX information to FeatureWordInfo, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 02/11] target-i386: Use FeatureWord loop on filter_features_for_kvm(), Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 04/11] target-i386: Introduce X86CPU::filtered_features field, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 05/11] target-i386: Add "filtered-features" property to X86CPU, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 08/11] target-i386: Emulate X86CPU subclasses for global properties, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 03/11] target-i386: Add "feature-words" property to X86CPU, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 06/11] qdev: Let qdev_prop_parse() pass through Error, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 07/11] qdev: Introduce qdev_prop_set_globals_for_type(), Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 09/11] target-i386: Change CPUID model of 486 to 8,
Andreas Färber <=
- [Qemu-devel] [PULL 10/11] target-i386: Introduce generic CPUID feature compat function, Andreas Färber, 2013/05/06
- [Qemu-devel] [PULL 11/11] target-i386: n270 can MOVBE, Andreas Färber, 2013/05/06