[Qemu-devel] [PATCH v2 15/21] cpuid: Adjust feature bit constants

[Andre Przywara]

Some constants defining common feature flags for well know CPUs were
not correct. Fix them and create additional ones which were used by
more than one CPU.

Signed-off-by: Andre Przywara <address@hidden>
---
 target-i386/cpuid.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 8ec730c..bae90e7 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -118,17 +118,17 @@ typedef struct x86_def_t {
     uint32_t flags;
 } x86_def_t;
 
-#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE)
-#define PENTIUM_FEATURES (I486_FEATURES | CPUID_DE | CPUID_TSC | \
-          CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_MMX)
-#define PENTIUM2_FEATURES (PENTIUM_FEATURES | CPUID_PAE | CPUID_SEP | \
-          CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV | CPUID_PAT | \
-          CPUID_PSE36 | CPUID_FXSR)
-#define PENTIUM3_FEATURES (PENTIUM2_FEATURES | CPUID_SSE)
-#define PPRO_FEATURES (CPUID_FP87 | CPUID_DE | CPUID_PSE | CPUID_TSC | \
-          CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_PGE | CPUID_CMOV | \
-          CPUID_PAT | CPUID_FXSR | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | \
-          CPUID_PAE | CPUID_SEP | CPUID_APIC)
+#define I486_FEATURES (CPUID_FP87 | CPUID_VME)
+#define PENTIUM_FEATURES (I486_FEATURES | CPUID_DE | CPUID_PSE | \
+        CPUID_TSC | CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_APIC)
+#define PPRO_FEATURES (PENTIUM_FEATURES | CPUID_PAE | CPUID_SEP | \
+        CPUID_MTRR | CPUID_PGE | CPUID_MCA | CPUID_CMOV)
+#define PENTIUM2_FEATURES (PPRO_FEATURES | CPUID_FXSR | CPUID_PAT | \
+        CPUID_PSE36 | CPUID_MMX)
+#define K8_FEATURES (PENTIUM2_FEATURES | CPUID_SSE | CPUID_SSE2 | 
CPUID_CLFLUSH)
+#define FULL_FEATURES (K8_FEATURES | CPUID_DTS | CPUID_ACPI | CPUID_SS | \
+        CPUID_TM | CPUID_PBE)
+#define EXT2_FEATURES_64 (CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX)
 #define EXT2_FEATURE_MASK 0x0183F3FF
 
 #define TCG_FEATURES (CPUID_FP87 | CPUID_PSE | CPUID_TSC | CPUID_MSR | \
@@ -288,7 +288,7 @@ static x86_def_t x86_defs[] = {
         .family = 5,
         .model = 4,
         .stepping = 3,
-        .features = PENTIUM_FEATURES,
+        .features = PENTIUM_FEATURES | CPUID_MMX,
         .xlevel = 0,
     },
     {
@@ -306,7 +306,7 @@ static x86_def_t x86_defs[] = {
         .family = 6,
         .model = 7,
         .stepping = 3,
-        .features = PENTIUM3_FEATURES,
+        .features = PENTIUM2_FEATURES | CPUID_SSE,
         .xlevel = 0,
     },
     {
-- 
1.6.1.3