[Qemu-devel] [PATCH for-next 1/4] target-ppc: Turn POWER5gs CPU into alias for POWER5+

[Andreas Färber]

Signed-off-by: Andreas Färber <address@hidden>
---
 target-ppc/cpu-models.c | 3 +--
 target-ppc/cpu-models.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c
index 9578ed8..49b193f 100644
--- a/target-ppc/cpu-models.c
+++ b/target-ppc/cpu-models.c
@@ -1126,8 +1126,6 @@
 #if defined(TODO)
     POWERPC_DEF("POWER5+",       CPU_POWERPC_POWER5P,                POWER5P,
                 "POWER5+")
-    POWERPC_DEF("POWER5gs",      CPU_POWERPC_POWER5GS,               POWER5P,
-                "POWER5GS")
 #endif
 #if defined(TODO)
     POWERPC_DEF("POWER6",        CPU_POWERPC_POWER6,                 POWER6,
@@ -1389,6 +1387,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
     { "Boxer", "POWER3" },
     { "Dino",  "POWER3" },
     { "POWER3+", "631" },
+    { "POWER5gs", "POWER5+" },
     { "POWER7", "POWER7_v2.3" },
     { "POWER8", "POWER8_v1.0" },
     { "970fx", "970fx_v3.1" },
diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h
index 01e488f..0e4db11 100644
--- a/target-ppc/cpu-models.h
+++ b/target-ppc/cpu-models.h
@@ -549,7 +549,6 @@ enum {
     CPU_POWERPC_POWER5             = 0x003A0203,
 #define CPU_POWERPC_POWER5GR         CPU_POWERPC_POWER5
     CPU_POWERPC_POWER5P            = 0x003B0000,
-#define CPU_POWERPC_POWER5GS         CPU_POWERPC_POWER5P
     CPU_POWERPC_POWER6             = 0x003E0000,
     CPU_POWERPC_POWER6_5           = 0x0F000001, /* POWER6 in POWER5 mode */
     CPU_POWERPC_POWER6A            = 0x0F000002,
-- 
1.8.1.4