Received: from eggs.gnu.org ([208.118.235.92]:48585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aa-0000Cb-TL for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a8-0000ct-AN for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:24 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:07:05 +0100 Message-Id: <1362773228-1747-64-git-send-email-agraf@suse.de> In-Reply-To: <1362773228-1747-1-git-send-email-agraf@suse.de> References: <1362773228-1747-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 63/66] target-ppc: List alias names alongside CPU models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= From: Andreas F=C3=A4rber Revert adding a separate -cpu ? output section for aliases and list them per CPU subclass. Requested-by: Alexander Graf Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 521cdcc..6fbb7b3 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8392,6 +8392,7 @@ static void ppc_cpu_list_entry(gpointer data, gpoin= ter user_data) PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); const char *typename =3D object_class_get_name(oc); char *name; + int i; =20 #if defined(TARGET_PPCEMB) if (pcc->mmu_model !=3D POWERPC_MMU_BOOKE) { @@ -8406,6 +8407,16 @@ static void ppc_cpu_list_entry(gpointer data, gpoi= nter user_data) strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n", name, pcc->pvr); + for (i =3D 0; i < ARRAY_SIZE(ppc_cpu_aliases); i++) { + const PowerPCCPUAlias *alias =3D &ppc_cpu_aliases[i]; + ObjectClass *alias_oc =3D ppc_cpu_class_by_name(alias->model); + + if (alias_oc !=3D oc) { + continue; + } + (*s->cpu_fprintf)(s->file, "PowerPC %-16s (alias for %s)\n", + alias->alias, name); + } g_free(name); } =20 @@ -8416,7 +8427,6 @@ void ppc_cpu_list(FILE *f, fprintf_function cpu_fpr= intf) .cpu_fprintf =3D cpu_fprintf, }; GSList *list; - int i; =20 list =3D object_class_get_list(TYPE_POWERPC_CPU, false); list =3D g_slist_sort(list, ppc_cpu_list_compare); @@ -8427,17 +8437,6 @@ void ppc_cpu_list(FILE *f, fprintf_function cpu_fp= rintf) cpu_fprintf(f, "\n"); cpu_fprintf(f, "PowerPC %-16s\n", "host"); #endif - - cpu_fprintf(f, "\n"); - for (i =3D 0; i < ARRAY_SIZE(ppc_cpu_aliases); i++) { - ObjectClass *oc =3D ppc_cpu_class_by_name(ppc_cpu_aliases[i].mod= el); - if (oc =3D=3D NULL) { - /* Hide aliases that point to a TODO or TODO_USER_ONLY model= */ - continue; - } - cpu_fprintf(f, "PowerPC %-16s\n", - ppc_cpu_aliases[i].alias); - } } =20 static void ppc_cpu_defs_entry(gpointer data, gpointer user_data) --=20 1.6.0.2