diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2016-10-28 22:30:29 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-11-15 10:05:51 +1100 |
| commit | e0aa311673db3717cd726a93be0efe0115b4cd59 (patch) | |
| tree | f754b7d830b4f50dea2fd92a599f02bbf03f6cce | |
| parent | ec575aa0ae8caf1c7af66dad753d1d19a958a8c5 (diff) | |
| download | qemu-e0aa311673db3717cd726a93be0efe0115b4cd59.tar.gz | |
ppc: Remove some stub POWER6 models
The CPU model table includes stub (commented out) definitions for
CPU_POWERPC_POWER6_5 and CPU_POWERPC_POWER6A. These are not real cpu
models, but represent the POWER6 in some compatiblity modes. If we ever
do implement POWER6 (unlikely), we'll implement its compatibility modes in
a different way (similar to what we do for POWER7 and POWER8). So these
stub definitions can be removed.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | target-ppc/cpu-models.c | 4 | ||||
| -rw-r--r-- | target-ppc/cpu-models.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index 901cf40033..506dee1ee8 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -1130,10 +1130,6 @@ #if defined(TODO) POWERPC_DEF("POWER6", CPU_POWERPC_POWER6, POWER6, "POWER6") - POWERPC_DEF("POWER6_5", CPU_POWERPC_POWER6_5, POWER5, - "POWER6 running in POWER5 mode") - POWERPC_DEF("POWER6A", CPU_POWERPC_POWER6A, POWER6, - "POWER6A") #endif POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, "POWER7 v2.3") diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h index 7d9e6a2ca0..aafbbd7d5d 100644 --- a/target-ppc/cpu-models.h +++ b/target-ppc/cpu-models.h @@ -549,8 +549,6 @@ enum { CPU_POWERPC_POWER5 = 0x003A0203, CPU_POWERPC_POWER5P_v21 = 0x003B0201, CPU_POWERPC_POWER6 = 0x003E0000, - CPU_POWERPC_POWER6_5 = 0x0F000001, /* POWER6 in POWER5 mode */ - CPU_POWERPC_POWER6A = 0x0F000002, CPU_POWERPC_POWER_SERVER_MASK = 0xFFFF0000, CPU_POWERPC_POWER7_BASE = 0x003F0000, CPU_POWERPC_POWER7_v23 = 0x003F0203, |