From nobody Tue Nov 4 13:11:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150413383392575.22345564589409; Wed, 30 Aug 2017 15:57:13 -0700 (PDT) Received: from localhost ([::1]:53123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnBv6-0007Wm-1M for importer@patchew.org; Wed, 30 Aug 2017 18:57:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnBr7-0003dC-H8 for qemu-devel@nongnu.org; Wed, 30 Aug 2017 18:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnBr6-0002IU-Cm for qemu-devel@nongnu.org; Wed, 30 Aug 2017 18:53:05 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dnBr6-0002IL-7j for qemu-devel@nongnu.org; Wed, 30 Aug 2017 18:53:04 -0400 Received: by mail-qt0-x242.google.com with SMTP id e2so6358782qta.3 for ; Wed, 30 Aug 2017 15:53:04 -0700 (PDT) Received: from yoga.offpageads.com ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id 54sm4449874qts.31.2017.08.30.15.53.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 15:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mMpZCBUgNH1SciTDtmu+o8yxtDWeOJquCD6SOyNAQ6Y=; b=U0jpz0yXOr3CDTwBfn/yWLKIIv+T0Mv8iyYZ4gwbdADKw1VYMZsSmsN7Lw8jKgJxCj SX2AmxywX3c+VczomJix4yd+XMGf2lTk4lcP3x/JmADLEZScKLTsc54dzMHsubsnize1 zSlLK3FcrbZ4Wb67nSC9ITSpO0HPNzDkaC8kqmnMu2RZph2IezLxtrPzsPJr7mICmdCn 0Pp5DUP96U+ygvpvXTpsyxNdzvJCxZ99X6b7fO+ylb7JWBUrVNrQW3qqFQY87x+JKvSj KdMit6S9u3qrQfol4uk5cFldc6UpCBPl3zMuRqv9PaD5sJUngXGUyh7z2dUfQXMXzXVp qzlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mMpZCBUgNH1SciTDtmu+o8yxtDWeOJquCD6SOyNAQ6Y=; b=Do9a8Czx3jUD6bhQ6p9cInAYDkXv7uSGMNUBJROdzeHaO+bSJIfnygbnS97d4FeKIW mY0aCcLs2efiT9JU2tPVlfm2rjNt/BOPWGqY/WJZljf1EEF+aM6SeNibuIN8po7/kjp0 109dwcUuh2tWoplvjh4DCLGavO9XFCSSGgSd3uwQnZrM+utau/xC144uMFGeyMMGvZQe uAC/jUhuwKGwjYZ6njgAeTgcUBRLJlIznAWK2Al+cTFhZx0evE54dijpxiHbKIGjQ8XT Pt6TwETiT7PZ6HLE4D6WsZiiMMhWKpEttaisyo80KDBY4X0vyH7PufJ9sveNZ8eE6nD3 D6xw== X-Gm-Message-State: AHPjjUhXlH11oDX8s/ySAOBqoSisIi2JFlA62Dkz4S22nU9YSOc+zvzK 5p9EnX8hIjWwuQ== X-Received: by 10.200.11.73 with SMTP id m9mr4826373qti.229.1504133583676; Wed, 30 Aug 2017 15:53:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Igor Mammedov , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum , James Hogan , Yongbok Kim Date: Wed, 30 Aug 2017 19:52:25 -0300 Message-Id: <20170830225225.27925-8-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170830225225.27925-1-f4bug@amsat.org> References: <20170830225225.27925-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 7/7] mips: update mips_cpu_list() to use object_class_get_list() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 while here, move it from translate_init.c to helper.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Igor Mammedov Tested-by: James Hogan --- target/mips/helper.c | 46 ++++++++++++++++++++++++++++++++++++++++= ++++ target/mips/translate_init.c | 10 ---------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index ea076261af..8d12b0088a 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -1093,3 +1093,49 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSSta= te *env, =20 cpu_loop_exit_restore(cs, pc); } + +/* Sort alphabetically by type name, except for "any". */ +static gint mips_cpu_list_compare(gconstpointer a, gconstpointer b) +{ + ObjectClass *class_a =3D (ObjectClass *)a; + ObjectClass *class_b =3D (ObjectClass *)b; + const char *name_a, *name_b; + + name_a =3D object_class_get_name(class_a); + name_b =3D object_class_get_name(class_b); + if (strcmp(name_a, "any-" TYPE_MIPS_CPU) =3D=3D 0) { + return 1; + } else if (strcmp(name_b, "any-" TYPE_MIPS_CPU) =3D=3D 0) { + return -1; + } else { + return strcmp(name_a, name_b); + } +} + +static void mips_cpu_list_entry(gpointer data, gpointer user_data) +{ + ObjectClass *oc =3D data; + CPUListState *s =3D user_data; + const char *typename; + char *name; + + typename =3D object_class_get_name(oc); + name =3D g_strndup(typename, strlen(typename) - strlen("-" TYPE_MIPS_C= PU)); + (*s->cpu_fprintf)(s->file, " %s\n", name); + g_free(name); +} + +void mips_cpu_list(FILE *f, fprintf_function cpu_fprintf) +{ + CPUListState s =3D { + .file =3D f, + .cpu_fprintf =3D cpu_fprintf, + }; + GSList *list; + + list =3D object_class_get_list(TYPE_MIPS_CPU, false); + list =3D g_slist_sort(list, mips_cpu_list_compare); + (*cpu_fprintf)(f, "Available CPUs:\n"); + g_slist_foreach(list, mips_cpu_list_entry, &s); + g_slist_free(list); +} diff --git a/target/mips/translate_init.c b/target/mips/translate_init.c index 8bbded46c4..b75f4c9065 100644 --- a/target/mips/translate_init.c +++ b/target/mips/translate_init.c @@ -767,16 +767,6 @@ static const mips_def_t *cpu_mips_find_by_name (const = char *name) return NULL; } =20 -void mips_cpu_list (FILE *f, fprintf_function cpu_fprintf) -{ - int i; - - for (i =3D 0; i < ARRAY_SIZE(mips_defs); i++) { - (*cpu_fprintf)(f, "MIPS '%s'\n", - mips_defs[i].name); - } -} - #ifndef CONFIG_USER_ONLY static void no_mmu_init (CPUMIPSState *env, const mips_def_t *def) { --=20 2.14.1