mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/ppc/cpu-models: Fix/remove bad CPU aliases

Browse Source 
There is no CPU model called "7447_v1.2" in our list, so the
"7447" alias should point to "7447_v1.1" instead. Let's also
remove the "codename" aliases that point to non-implemented
CPU models - they are really of no use here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Thomas Huth 2017-01-24 12:48:05 +01:00 committed by David Gibson
parent 6a07692ffa
commit c636367311
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/ppc/cpu-models.c
View File

@ -1375,19 +1375,15 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "7445", "7445_v3.2" }, { "7445", "7445_v3.2" },
{ "7455", "7455_v3.2" }, { "7455", "7455_v3.2" },
{ "Apollo6", "7455" }, { "Apollo6", "7455" },
{ "7447", "7447_v1.2" }, { "7447", "7447_v1.1" },
{ "7457", "7457_v1.2" }, { "7457", "7457_v1.2" },
{ "Apollo7", "7457" }, { "Apollo7", "7457" },
{ "7447A", "7447A_v1.2" }, { "7447A", "7447A_v1.2" },
{ "7457A", "7457A_v1.2" }, { "7457A", "7457A_v1.2" },
{ "Apollo7PM", "7457A_v1.0" }, { "Apollo7PM", "7457A_v1.0" },
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
{ "Trident", "620" },
{ "POWER3", "630" }, { "POWER3", "630" },
{ "Boxer", "POWER3" },
{ "Dino", "POWER3" },
{ "POWER3+", "631" }, { "POWER3+", "631" },
{ "POWER5gr", "POWER5" },
{ "POWER5+", "POWER5+_v2.1" }, { "POWER5+", "POWER5+_v2.1" },
{ "POWER5gs", "POWER5+_v2.1" }, { "POWER5gs", "POWER5+_v2.1" },
{ "POWER7", "POWER7_v2.3" }, { "POWER7", "POWER7_v2.3" },
@ -1399,21 +1395,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "970", "970_v2.2" }, { "970", "970_v2.2" },
{ "970fx", "970fx_v3.1" }, { "970fx", "970fx_v3.1" },
{ "970mp", "970mp_v1.1" }, { "970mp", "970mp_v1.1" },
{ "Apache", "RS64" },
{ "A35", "RS64" },
{ "NorthStar", "RS64-II" },
{ "A50", "RS64-II" },
{ "Pulsar", "RS64-III" },
{ "IceStar", "RS64-IV" },
{ "IStar", "RS64-IV" },
{ "SStar", "RS64-IV" },
#endif #endif
{ "RIOS", "POWER" },
{ "RSC", "POWER" },
{ "RSC3308", "POWER" },
{ "RSC4608", "POWER" },
{ "RSC2", "POWER2" },
{ "P2SC", "POWER2" },
/* Generic PowerPCs */ /* Generic PowerPCs */
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)