From patchwork Fri Mar 8 20:07:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 226234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E3EF92C03AA for ; Sat, 9 Mar 2013 07:29:01 +1100 (EST) Received: from localhost ([::1]:46524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3uV-0006RK-Vo for incoming@patchwork.ozlabs.org; Fri, 08 Mar 2013 15:29:00 -0500 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 Received: from cantor2.suse.de ([195.135.220.15]:39358 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3a8-0000ba-39; Fri, 08 Mar 2013 15:07:56 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EA04DA5271; Fri, 8 Mar 2013 21:07:13 +0100 (CET) From: Alexander Graf To: qemu-devel qemu-devel Date: Fri, 8 Mar 2013 21:07:05 +0100 Message-Id: <1362773228-1747-64-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , "qemu-ppc@nongnu.org list:PowerPC" , =?utf-8?q?Andreas=20F=C3=A4rber?= , =?utf-8?q?Aur=C3=A9lien=20Jarno?= Subject: [Qemu-devel] [PATCH 63/66] target-ppc: List alias names alongside CPU models X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber Revert adding a separate -cpu ? output section for aliases and list them per CPU subclass. Requested-by: Alexander Graf Signed-off-by: Andreas Färber 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, gpointer user_data) PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); const char *typename = object_class_get_name(oc); char *name; + int i; #if defined(TARGET_PPCEMB) if (pcc->mmu_model != POWERPC_MMU_BOOKE) { @@ -8406,6 +8407,16 @@ static void ppc_cpu_list_entry(gpointer data, gpointer user_data) strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n", name, pcc->pvr); + for (i = 0; i < ARRAY_SIZE(ppc_cpu_aliases); i++) { + const PowerPCCPUAlias *alias = &ppc_cpu_aliases[i]; + ObjectClass *alias_oc = ppc_cpu_class_by_name(alias->model); + + if (alias_oc != oc) { + continue; + } + (*s->cpu_fprintf)(s->file, "PowerPC %-16s (alias for %s)\n", + alias->alias, name); + } g_free(name); } @@ -8416,7 +8427,6 @@ void ppc_cpu_list(FILE *f, fprintf_function cpu_fprintf) .cpu_fprintf = cpu_fprintf, }; GSList *list; - int i; list = object_class_get_list(TYPE_POWERPC_CPU, false); list = g_slist_sort(list, ppc_cpu_list_compare); @@ -8427,17 +8437,6 @@ void ppc_cpu_list(FILE *f, fprintf_function cpu_fprintf) cpu_fprintf(f, "\n"); cpu_fprintf(f, "PowerPC %-16s\n", "host"); #endif - - cpu_fprintf(f, "\n"); - for (i = 0; i < ARRAY_SIZE(ppc_cpu_aliases); i++) { - ObjectClass *oc = ppc_cpu_class_by_name(ppc_cpu_aliases[i].model); - if (oc == 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); - } } static void ppc_cpu_defs_entry(gpointer data, gpointer user_data)