From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e06Z0-0007X5-7X for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e06Yz-00006s-4S for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39812) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e06Yy-00005y-SY for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:45 -0400 From: Igor Mammedov Date: Thu, 5 Oct 2017 15:50:57 +0200 Message-Id: <1507211474-188400-24-git-send-email-imammedo@redhat.com> In-Reply-To: <1507211474-188400-1-git-send-email-imammedo@redhat.com> References: <1507211474-188400-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 23/40] sh4: remove SuperHCPUClass::name field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , aurelien@aurel32.net the field contains upper-cased cpu model name and is used for printing supported cpu model names for '-cpu help'. Considering that cpu model lookup in superh_cpu_class_by_name() is case-insensitive, we can drop upper-casing when printing supported cpus list and use cpu type directly to do the same by cutting out SUPERH_CPU_TYPE_SUFFIX from typename. It allows to remove SuperHCPUClass::name, which practically duplicates names defined by TYPE_SH*_CPU definitions and simplify sh*_class_init()/SuperHCPUClass a bit. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- CC: aurelien@aurel32.net --- target/sh4/cpu-qom.h | 2 -- target/sh4/cpu.c | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/target/sh4/cpu-qom.h b/target/sh4/cpu-qom.h index 17deeb6..0f9fb4d 100644 --- a/target/sh4/cpu-qom.h +++ b/target/sh4/cpu-qom.h @@ -39,7 +39,6 @@ * SuperHCPUClass: * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. - * @name: The name. * @pvr: Processor Version Register * @prr: Processor Revision Register * @cvr: Cache Version Register @@ -54,7 +53,6 @@ typedef struct SuperHCPUClass { DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); =20 - const char *name; uint32_t pvr; uint32_t prr; uint32_t cvr; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index e715560..9006645 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -98,12 +98,11 @@ static gint superh_cpu_list_compare(gconstpointer a, = gconstpointer b) =20 static void superh_cpu_list_entry(gpointer data, gpointer user_data) { - ObjectClass *oc =3D data; - SuperHCPUClass *scc =3D SUPERH_CPU_CLASS(oc); SuperHCPUListState *s =3D user_data; + const char *typename =3D object_class_get_name(OBJECT_CLASS(data)); + int len =3D strlen(typename) - strlen(SUPERH_CPU_TYPE_SUFFIX); =20 - (*s->cpu_fprintf)(s->file, "%s\n", - scc->name); + (*s->cpu_fprintf)(s->file, "%.*s\n", len, typename); } =20 void sh4_cpu_list(FILE *f, fprintf_function cpu_fprintf) @@ -156,7 +155,6 @@ static void sh7750r_class_init(ObjectClass *oc, void = *data) { SuperHCPUClass *scc =3D SUPERH_CPU_CLASS(oc); =20 - scc->name =3D "SH7750R"; scc->pvr =3D 0x00050000; scc->prr =3D 0x00000100; scc->cvr =3D 0x00110000; @@ -175,7 +173,6 @@ static void sh7751r_class_init(ObjectClass *oc, void = *data) { SuperHCPUClass *scc =3D SUPERH_CPU_CLASS(oc); =20 - scc->name =3D "SH7751R"; scc->pvr =3D 0x04050005; scc->prr =3D 0x00000113; scc->cvr =3D 0x00110000; /* Neutered caches, should be 0x20480000 */ @@ -194,7 +191,6 @@ static void sh7785_class_init(ObjectClass *oc, void *= data) { SuperHCPUClass *scc =3D SUPERH_CPU_CLASS(oc); =20 - scc->name =3D "SH7785"; scc->pvr =3D 0x10300700; scc->prr =3D 0x00000200; scc->cvr =3D 0x71440211; --=20 2.7.4