From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e06Yy-0007Vb-Sr for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e06Yx-00005j-W9 for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e06Yx-000052-NO for qemu-devel@nongnu.org; Thu, 05 Oct 2017 09:51:43 -0400 From: Igor Mammedov Date: Thu, 5 Oct 2017 15:50:56 +0200 Message-Id: <1507211474-188400-23-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 22/40] sh4: simplify superh_cpu_class_by_name() 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 currently for sh4 cpu_model argument for '-cpu' option could be either 'cpu model' name or cpu_typename. however typically '-cpu' takes 'cpu model' name and cpu type for sh4 target isn't advertised publicly ('-cpu help' prints only 'cpu model' names) so we shouldn't care about this use case (it's more of a bug). 1. Drop '-cpu cpu_typename' to align with the rest of targets. 2. Compose searched for typename from cpu model and use it with object_class_by_name() directly instead of over-complicated object_class_get_list() g_slist_find_custom() + superh_cpu_name_compare() With #1 droped, #2 could be used for both lookups which simplifies superh_cpu_class_by_name() quite a bit. Signed-off-by: Igor Mammedov Acked-by: Philippe Mathieu-Daud=C3=A9 --- v2: - there is no need to NULL-initialize 'oc' in superh_cpu_class_by_name(= ) also drop extra ';' (Philippe Mathieu-Daud=C3=A9) CC: aurelien@aurel32.net --- target/sh4/cpu.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 72f1dec..e715560 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -120,36 +120,26 @@ void sh4_cpu_list(FILE *f, fprintf_function cpu_fpr= intf) g_slist_free(list); } =20 -static gint superh_cpu_name_compare(gconstpointer a, gconstpointer b) -{ - const SuperHCPUClass *scc =3D SUPERH_CPU_CLASS(a); - const char *name =3D b; - - return strcasecmp(scc->name, name); -} - static ObjectClass *superh_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; - GSList *list, *item; + char *s, *typename =3D NULL; =20 - if (strcasecmp(cpu_model, "any") =3D=3D 0) { - return object_class_by_name(TYPE_SH7750R_CPU); + s =3D g_ascii_strdown(cpu_model, -1); + if (strcmp(s, "any") =3D=3D 0) { + oc =3D object_class_by_name(TYPE_SH7750R_CPU); + goto out; } =20 - oc =3D object_class_by_name(cpu_model); - if (oc !=3D NULL && object_class_dynamic_cast(oc, TYPE_SUPERH_CPU) != =3D NULL - && !object_class_is_abstract(oc)) { - return oc; + typename =3D g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s); + oc =3D object_class_by_name(typename); + if (oc !=3D NULL && object_class_is_abstract(oc)) { + oc =3D NULL; } =20 - oc =3D NULL; - list =3D object_class_get_list(TYPE_SUPERH_CPU, false); - item =3D g_slist_find_custom(list, cpu_model, superh_cpu_name_compar= e); - if (item !=3D NULL) { - oc =3D item->data; - } - g_slist_free(list); +out: + g_free(s); + g_free(typename); return oc; } =20 --=20 2.7.4