From nobody Tue Feb 10 07:41:32 2026 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 1502944662593673.81193349023; Wed, 16 Aug 2017 21:37:42 -0700 (PDT) Received: from localhost ([::1]:56795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diCYv-00064J-I5 for importer@patchew.org; Thu, 17 Aug 2017 00:37:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diCTJ-0000ws-So for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diCTI-0005Jb-SY for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:53 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1diCTI-0005JK-NP for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:52 -0400 Received: by mail-qt0-x242.google.com with SMTP id i19so5325285qte.1 for ; Wed, 16 Aug 2017 21:31:52 -0700 (PDT) Received: from yoga.offpageads.com (host21.190-139-16.telecom.net.ar. [190.139.16.21]) by smtp.gmail.com with ESMTPSA id l11sm1748738qtl.24.2017.08.16.21.31.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 21:31:51 -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=aPXCK4yDIgK86wQzowvIMPpKHcDnmH/v1B9MwUxwMcc=; b=b9fLmcn8Ydc2TUufv/EbTFZlzZZeEYIbAW3IRO2KjrNgjfcIR9esR1BZJveoifpNzb 2n8IoG1WkAdmWmdUa2pleK2t+jIykxNtiwFAtpYvi2l5LMgr4cFHhdUiNY38jL9XIgkH BrCbUGN5irBKPtzUTMj9hczB6hvTABkKn4i5AGtpPo6EkyF+i0sWXUgrSDpgtbNEr+D4 cFjPyJPdrnx30ExSaxDoeFA+PE5VqqXUOqCPxao7krqMnjbmFlVGRZ+kVt5Ybf3CCkiu 0RDVpmDEehfVMCkimRer3oLarYt/J3soTehNWySrRz3GCLgdRATFvo9YLGaCYLfX28H2 rTnw== 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=aPXCK4yDIgK86wQzowvIMPpKHcDnmH/v1B9MwUxwMcc=; b=gix9C/nEeUZ5w6RjJFkBNDMB3nJiANash4xkTOtjayPZ8XGFQuV1M0yCdKv7rp+YOh lbpWMb5vx3cZ/yUcFGfETLWLbURpCK2ARC2meoBHeLXzuyJrBViYWpwVL+7FgNEqzT3w Ec9u8Kc9Oj9yKd8RHEGOaKCe5xR9BsrFucZZl7iU6ElPnNweHdsPO6nHlaTIzsKt66xt nu6kcZJD1GjElQVQ8YN64XMsQu5O36iBzANcAmKBhqSiJUhRtEWqj91rICSB1y0gx6xc tbFS9MK44cn3cN7zcsJt819AdCKQDf7LNtkP3IQVE3gGtflC2VJRd7rzs2BkpuNq6raV G+5Q== X-Gm-Message-State: AHYfb5inSgnX9d3FS/Pv9fluommdlWgDHzBeWSKsw6FheRS17q2M/XG0 1KGsny9pWUGyxw== X-Received: by 10.200.40.135 with SMTP id i7mr6066503qti.55.1502944312289; Wed, 16 Aug 2017 21:31:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Igor Mammedov , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Yongbok Kim Date: Thu, 17 Aug 2017 01:31:02 -0300 Message-Id: <20170817043102.6322-9-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170817043102.6322-1-f4bug@amsat.org> References: <20170817043102.6322-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 8/8] 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: Peter Maydell , Thomas Huth , James Hogan , Eduardo Habkost , =?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 --- 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