Received: from eggs.gnu.org ([208.118.235.92]:48488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UE3aU-0000CK-1w for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UE3a7-0000ay-NT for qemu-devel@nongnu.org; Fri, 08 Mar 2013 15:08:17 -0500 From: Alexander Graf Date: Fri, 8 Mar 2013 21:06:45 +0100 Message-Id: <1362773228-1747-44-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 43/66] target-ppc: Get model name from type name 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 We are about to drop the redundant name field along with ppc_def_t. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- target-ppc/translate_init.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 9d4831f..7eb565d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9979,9 +9979,14 @@ static void ppc_cpu_list_entry(gpointer data, gpoi= nter user_data) ObjectClass *oc =3D data; CPUListState *s =3D user_data; PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); + const char *typename =3D object_class_get_name(oc); + char *name; =20 + name =3D g_strndup(typename, + strlen(typename) - strlen("-" TYPE_POWERPC_CPU)); (*s->cpu_fprintf)(s->file, "PowerPC %-16s PVR %08x\n", - pcc->info->name, pcc->info->pvr); + name, pcc->info->pvr); + g_free(name); } =20 void ppc_cpu_list(FILE *f, fprintf_function cpu_fprintf) @@ -10014,12 +10019,14 @@ static void ppc_cpu_defs_entry(gpointer data, g= pointer user_data) { ObjectClass *oc =3D data; CpuDefinitionInfoList **first =3D user_data; - PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); + const char *typename; CpuDefinitionInfoList *entry; CpuDefinitionInfo *info; =20 + typename =3D object_class_get_name(oc); info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(pcc->info->name); + info->name =3D g_strndup(typename, + strlen(typename) - strlen("-" TYPE_POWERPC_CP= U)); =20 entry =3D g_malloc0(sizeof(*entry)); entry->value =3D info; --=20 1.6.0.2