[Qemu-devel] [PATCH 06/12] cpuid: add missing CPUID feature flag names

[Andre Przywara]

some CPUID feature flags had no string value, so they could not be
switched on or off from the command line.
Add names for the missing ones and obey the 80 characters limit on
the way.

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

diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 9ddf714..ab3565e 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -36,24 +36,32 @@
 static const char *feature_name[] = {
     "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
     "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
-    "pat", "pse36", "pn" /* Intel psn */, "clflush" /* Intel clfsh */, NULL, 
"ds" /* Intel dts */, "acpi", "mmx",
+    "pat", "pse36", "pn" /* Intel psn */, "clflush" /* Intel clfsh */,
+        NULL, "ds" /* Intel dts */, "acpi", "mmx",
     "fxsr", "sse", "sse2", "ss", "ht" /* Intel htt */, "tm", "ia64", "pbe",
 };
 static const char *ext_feature_name[] = {
-    "pni" /* Intel,AMD sse3 */, NULL, NULL, "monitor", "ds_cpl", "vmx", NULL 
/* Linux smx */, "est",
-    "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
-    NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt",
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, "hypervisor",
+    "pni" /* Intel,AMD sse3 */, NULL, "dtes64", "monitor",
+        "ds_cpl", "vmx", "smx", "est",
+    "tm2", "ssse3", "cid", NULL, NULL /* FMA */, "cx16", "xtpr", "pdcm",
+    NULL, NULL, "dca", "sse4_1", "sse4_2", "x2apic", "movbe", "popcnt",
+    NULL, NULL /* AES */, "xsave", "osxsave",
+        NULL /* AVX */, NULL, NULL, "hypervisor",
 };
 static const char *ext2_feature_name[] = {
     "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
-    "cx8" /* AMD CMPXCHG8B */, "apic", NULL, "syscall", "mtrr", "pge", "mca", 
"cmov",
-    "pat", "pse36", NULL, NULL /* Linux mp */, "nx" /* Intel xd */, NULL, 
"mmxext", "mmx",
-    "fxsr", "fxsr_opt" /* AMD ffxsr */, "pdpe1gb" /* AMD Page1GB */, "rdtscp", 
NULL, "lm" /* Intel 64 */, "3dnowext", "3dnow",
+    "cx8" /* AMD CMPXCHG8B */, "apic", NULL, "syscall",
+        "mtrr", "pge", "mca", "cmov",
+    "pat", "pse36", NULL, NULL /* Linux mp */,
+        "nx" /* Intel xd */, NULL, "mmxext", "mmx",
+    "fxsr", "fxsr_opt" /* AMD ffxsr */, "pdpe1gb" /* AMD Page1GB */, "rdtscp",
+        NULL, "lm" /* Intel 64 */, "3dnowext", "3dnow",
 };
 static const char *ext3_feature_name[] = {
-    "lahf_lm" /* AMD LahfSahf */, "cmp_legacy", "svm", "extapic" /* AMD 
ExtApicSpace */, "cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse",
-    "3dnowprefetch", "osvw", NULL /* Linux ibs */, NULL, "skinit", "wdt", 
NULL, NULL,
+    "lahf_lm" /* AMD LahfSahf */, "cmp_legacy",
+        "svm", "extapic" /* AMD ExtApicSpace */,
+        "cr8legacy" /* AMD AltMovCr8 */, "abm", "sse4a", "misalignsse",
+    "3dnowprefetch", "osvw", "ibs", "sse5", "skinit", "wdt", NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
-- 
1.6.1.3