From nobody Sat May 18 10:07:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1713592062; cv=none; d=zohomail.com; s=zohoarc; b=Avi5xDvJ8qKaU3fJvE9soymBi2mdy5lkpUSjreluE/cKgHDT2vpuiXa/bK8AqeMIqVLdOGbPwKQR7sXjFRT48qW5xg+dq6TaAgsFP5dtgDq/2R2mok20wJfWWRaXTauMEuqujO4gUWFJXLwUEqPfoOPqSKGH3gya2FEBORZDV+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713592062; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VDidJPtQ1hsEoE1S5vbkkb8deUNiUQ8N5oRRQWyroFI=; b=mVZw6Omlnb23RRd4HlE1p+50IBj8pMwtkD1TF8j68S0OmbLblq24yxUyRVWbcoy5T8QO8W46rAjlQ1FAjSE5vTmhG8gGa1nHugd0jd9iJsbdPbWo1E6r8RB9MzW6O8/esANR/qAAsweSAU0rsdIZwt09mo2e9pOUe0sXDPOcCtk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713592062282663.4309543213716; Fri, 19 Apr 2024 22:47:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry3Z6-0003gb-Cm; Sat, 20 Apr 2024 01:47:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3Yx-0003aa-K1 for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:47:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3Yw-0007Ll-1s for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:46:59 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-78-Dcs-t54rOwSCTPcV9mTqiQ-1; Sat, 20 Apr 2024 01:46:12 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D32729AA2C2; Sat, 20 Apr 2024 05:46:12 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF97F400F12; Sat, 20 Apr 2024 05:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713592016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VDidJPtQ1hsEoE1S5vbkkb8deUNiUQ8N5oRRQWyroFI=; b=iUMLrcpdy0zhFe+kd1LqATARpARXhQ9GcQ+G+A5XplCL0vpdZYx0SkSds84MK/3nnzxRcc Ritkx8e+MR9vOPcJPJYHolAwacRpRgS4mJsgyGlClQKGsb41zxDVpAsNp1NOdiDw48Od4U o0gKQ5avrrPNNfPpoU3SdzJ5Wlj3vpI= X-MC-Unique: Dcs-t54rOwSCTPcV9mTqiQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Nicholas Piggin , Daniel Henrique Barboza , David Hildenbrand , Richard Henderson , qemu-trivial@nongnu.org Subject: [PATCH 1/3] target/i386/cpu: Remove "x86" prefix from the CPU list Date: Sat, 20 Apr 2024 07:46:04 +0200 Message-ID: <20240420054606.13353-2-thuth@redhat.com> In-Reply-To: <20240420054606.13353-1-thuth@redhat.com> References: <20240420054606.13353-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.313, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1713592063214100003 Content-Type: text/plain; charset="utf-8" Printing an "x86" in front of each CPU name is not helpful at all: It is confusing for the users since they don't know whether they have to specify these letters for the "-cpu" parameter, too, and it also takes some precious space in the dense output of the CPU entries. Let's simply remove this now and use two spaces at the beginning of the lines for the indentation of the entries instead, like most other target architectures are doing it for their CPU help output already. Signed-off-by: Thomas Huth Reviewed-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Mario Casquero --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 33760a2ee1..fd46e264a2 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5572,7 +5572,7 @@ static void x86_cpu_list_entry(gpointer data, gpointe= r user_data) desc =3D g_strdup_printf("%s (deprecated)", olddesc); } =20 - qemu_printf("x86 %-20s %s\n", name, desc); + qemu_printf(" %-20s %s\n", name, desc); } =20 /* list available CPU models and flags */ --=20 2.44.0 From nobody Sat May 18 10:07:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1713592006; cv=none; d=zohomail.com; s=zohoarc; b=DMS0Yg1qmVeqjfabU6XaJj/odhqA21xkQL/AjvIKA95RrNFzLXNC0RsvM4khXHi9UonclCNKySPL9RnutRMKZaf3LG5fK58qf7SeIP2ksvxzvNw29cCQ4RLyR//lG+sVEOqH3amAp0j7Y08l1bF/re6vjPJ/+B1XHkf/ekyqbxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713592006; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EMWUQ3sACt7zOgNPCN2ljNdKhKO9rowCkaSFETC5Nb8=; b=YivFrwwPEg7ZL7oidlyZ2cGZoOnQ2eBLIWKspcAPxN6zJkpJZaQFR1iTeKxuQ2KfBXGVHadkqYn+DuPegLJzoMsDTIYJIK9DN0+9dAgBTJTPu0TkAh1R1PyQUA5M6JoshSvBVTsY+o/huL6XAzFXKKpd4iaCac7UShM2tYk09yk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713592006066620.8088742755042; Fri, 19 Apr 2024 22:46:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry3YQ-00033H-2u; Sat, 20 Apr 2024 01:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3YK-00031S-RR for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:46:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3YJ-0007HF-4V for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:46:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-uCOIWAVkMEOZuYWDyslapQ-1; Sat, 20 Apr 2024 01:46:16 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B3C038884A6; Sat, 20 Apr 2024 05:46:15 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFA0E400F12; Sat, 20 Apr 2024 05:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713591978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EMWUQ3sACt7zOgNPCN2ljNdKhKO9rowCkaSFETC5Nb8=; b=WUgPrhVHkevfx76W09/R1RSDyarAfEDZZkySs18+sEym6y1jrzAp7Tlztx5QxoRSiDoHJq oQu8A+ywwvSz9Vsue2ZFQ9ehcUGpmQM9aRFqniTTN/t+LDoRyT0H8a+b7BJXPl41cs4fFA lGkyPNFGZlM/xaxkl+WOrulF+s60guU= X-MC-Unique: uCOIWAVkMEOZuYWDyslapQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Nicholas Piggin , Daniel Henrique Barboza , David Hildenbrand , Richard Henderson , qemu-trivial@nongnu.org Subject: [PATCH 2/3] target/s390x/cpu_models: Rework the output of "-cpu help" Date: Sat, 20 Apr 2024 07:46:05 +0200 Message-ID: <20240420054606.13353-3-thuth@redhat.com> In-Reply-To: <20240420054606.13353-1-thuth@redhat.com> References: <20240420054606.13353-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.313, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1713592007106100003 Content-Type: text/plain; charset="utf-8" Printing an "s390x" in front of each CPU name is not helpful at all: It is confusing for the users since they don't know whether they have to specify these letters for the "-cpu" parameter, too, and it also takes some precious space in the dense output of the CPU entries. Let's simply remove this now! While we're at it, use two spaces at the beginning of the lines for the indentation of the entries, and add a "Available CPUs" in the very first line, like most other target architectures are doing it for their "-cpu help" output already. Signed-off-by: Thomas Huth Reviewed-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Mario Casquero --- target/s390x/cpu_models.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 8ed3bb6a27..58c58f05a0 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -355,9 +355,9 @@ static void s390_print_cpu_model_list_entry(gpointer da= ta, gpointer user_data) /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] =3D 0; if (details->len) { - qemu_printf("s390 %-15s %-35s (%s)\n", name, scc->desc, details->s= tr); + qemu_printf(" %-15s %-35s (%s)\n", name, scc->desc, details->str); } else { - qemu_printf("s390 %-15s %-35s\n", name, scc->desc); + qemu_printf(" %-15s %-35s\n", name, scc->desc); } g_free(name); } @@ -402,6 +402,7 @@ void s390_cpu_list(void) S390Feat feat; GSList *list; =20 + qemu_printf("Available CPUs:\n"); list =3D object_class_get_list(TYPE_S390_CPU, false); list =3D g_slist_sort(list, s390_cpu_list_compare); g_slist_foreach(list, s390_print_cpu_model_list_entry, NULL); @@ -411,14 +412,14 @@ void s390_cpu_list(void) for (feat =3D 0; feat < S390_FEAT_MAX; feat++) { const S390FeatDef *def =3D s390_feat_def(feat); =20 - qemu_printf("%-20s %s\n", def->name, def->desc); + qemu_printf(" %-20s %s\n", def->name, def->desc); } =20 qemu_printf("\nRecognized feature groups:\n"); for (group =3D 0; group < S390_FEAT_GROUP_MAX; group++) { const S390FeatGroupDef *def =3D s390_feat_group_def(group); =20 - qemu_printf("%-20s %s\n", def->name, def->desc); + qemu_printf(" %-20s %s\n", def->name, def->desc); } } =20 --=20 2.44.0 From nobody Sat May 18 10:07:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1713592283; cv=none; d=zohomail.com; s=zohoarc; b=nTjoRCxvl/EjqdthMNPhfMK0Q1iuJ8jtVxUwm3s9G2gfsn4o1olRe+005fBXu4Y/LdCd1qFcu1FTM7PAuiwjg/hKOgXrXf/HZphaTwl/ZBJ4voOsA51y6Jix6kE45hosZEWKLOUrZ6cYmS/B1iNtAcrT9zZxNdOGRahFlKgoGbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713592283; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hiBBi/D8vIAXBkHtBhZYpSiL1hFS+yB7+IB8oel7o4M=; b=nEvcQIniD+n+/s3q9F78fWkwFA5f9D/UgPeYphkeSkr+KyCEr2uGAOuVFAoX5fs8ZwAhWH/U6dF3tIUaADOPPssX8b2cfN9HjVLsn9Fx8PVCtuF9KwWaX9t3QfQAu4jAMBjhwJ0aCq9tcrHbpWvxa45mtdaTz8a01AU0dDlCgu0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1713592283275944.690273761508; Fri, 19 Apr 2024 22:51:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ry3cz-0005gp-Kw; Sat, 20 Apr 2024 01:51:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3cw-0005eV-0y for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:51:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ry3cu-0007vS-GA for qemu-devel@nongnu.org; Sat, 20 Apr 2024 01:51:05 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-quke_YltMr2tR0w6MvPWrQ-1; Sat, 20 Apr 2024 01:46:18 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0DF921044577; Sat, 20 Apr 2024 05:46:18 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1DE2492BC7; Sat, 20 Apr 2024 05:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713592263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hiBBi/D8vIAXBkHtBhZYpSiL1hFS+yB7+IB8oel7o4M=; b=GFkh/f0nC8t5PyUT21ykQFN5+KSvKvK4X48OgQG9j13/4CTclZrJbimqE3JdtWYSs9Zl2H 2iz5d3b2ZeZUhsXcnzYAiicN1fKqptYylKGZZjz4eqIoHWn8S8w2oFQWYf2V4dqMMb1qw7 GLLv7/AH7xn+ds/XyGgUTE+D7eE+WEk= X-MC-Unique: quke_YltMr2tR0w6MvPWrQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Nicholas Piggin , Daniel Henrique Barboza , David Hildenbrand , Richard Henderson , qemu-trivial@nongnu.org Subject: [PATCH 3/3] target/ppc/cpu_init: Remove "PowerPC" prefix from the CPU list Date: Sat, 20 Apr 2024 07:46:06 +0200 Message-ID: <20240420054606.13353-4-thuth@redhat.com> In-Reply-To: <20240420054606.13353-1-thuth@redhat.com> References: <20240420054606.13353-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.313, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_SUBJ_WIPE_DEBT=1.004 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1713592283908100003 Content-Type: text/plain; charset="utf-8" Printing a "PowerPC" in front of each CPU name is not helpful at all: It is confusing for the users since they don't know whether they have to specify these letters for the "-cpu" parameter, too, and it also takes some precious space in the dense output of the CPU entries. Let's simply remove this now and use two spaces at the beginning of the lines for the indentation of the entries instead, and add a "Available CPUs" in the very first line, like most other target architectures are doing it for their CPU help output already. Signed-off-by: Thomas Huth Reviewed-by: Michael Tokarev Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Mario Casquero --- target/ppc/cpu_init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6241de62ce..8b932dccfb 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7063,7 +7063,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointe= r user_data) } =20 name =3D cpu_model_from_type(typename); - qemu_printf("PowerPC %-16s PVR %08x\n", name, pcc->pvr); + qemu_printf(" %-16s PVR %08x\n", name, pcc->pvr); for (i =3D 0; ppc_cpu_aliases[i].alias !=3D NULL; i++) { PowerPCCPUAlias *alias =3D &ppc_cpu_aliases[i]; ObjectClass *alias_oc =3D ppc_cpu_class_by_name(alias->model); @@ -7076,10 +7076,10 @@ static void ppc_cpu_list_entry(gpointer data, gpoin= ter user_data) * avoid printing the wrong alias here and use "preferred" instead */ if (strcmp(alias->alias, family->desc) =3D=3D 0) { - qemu_printf("PowerPC %-16s (alias for preferred %s CPU)\n", + qemu_printf(" %-16s (alias for preferred %s CPU)\n", alias->alias, family->desc); } else { - qemu_printf("PowerPC %-16s (alias for %s)\n", + qemu_printf(" %-16s (alias for %s)\n", alias->alias, name); } } @@ -7090,6 +7090,7 @@ void ppc_cpu_list(void) { GSList *list; =20 + qemu_printf("Available CPUs:\n"); list =3D object_class_get_list(TYPE_POWERPC_CPU, false); list =3D g_slist_sort(list, ppc_cpu_list_compare); g_slist_foreach(list, ppc_cpu_list_entry, NULL); @@ -7097,7 +7098,7 @@ void ppc_cpu_list(void) =20 #ifdef CONFIG_KVM qemu_printf("\n"); - qemu_printf("PowerPC %s\n", "host"); + qemu_printf(" %s\n", "host"); #endif } =20 --=20 2.44.0