From nobody Sun May 19 00:42:51 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=1658491624; cv=none; d=zohomail.com; s=zohoarc; b=n3Y1ZIcdugWS25NeKUm3AtOqUcfwFmQQ+hc8wdFcpbwuT2izNJ9JeuWvk5QrTg1Rq0VPohHkj+YAJwHEKWyuT68YrB8jyzivRC+/xclzFRQFZHhbQVZgiRGWCejLd8EWSoATZrgR7aEnbvNe8gB6BE+YpIv//FBjYWZWC26Qwrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658491624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5plUTj3W6URKiDXw4zyraz6gdfc5Jjz2aZBFO0prHIw=; b=Z5w0CG1WoD7pBPjlQzRiVRfbGbbFk4jSNrC0ouoelXrpn0xqTD3YXbgS9Un0Xn3ib3msjY4I1GL6mm0U0M3b9wMBocX8G9uJOIip5OjKie7XTuDjvkAfLYkskLGDYHO5LuMMBMQgN2qlQbtJgvPWHWmRUM7D2wCYTKun2s3h0/A= 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 1658491624649983.4115989119875; Fri, 22 Jul 2022 05:07:04 -0700 (PDT) Received: from localhost ([::1]:47908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oErQt-0005vd-7z for importer@patchew.org; Fri, 22 Jul 2022 08:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMb-0008Pj-RK for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMW-0006Fs-JK for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:37 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-YO-C78BdPCCBYzDyR6iX6w-1; Fri, 22 Jul 2022 08:02:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 74BAF85A584; Fri, 22 Jul 2022 12:02:28 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 396A11121314; Fri, 22 Jul 2022 12:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658491352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5plUTj3W6URKiDXw4zyraz6gdfc5Jjz2aZBFO0prHIw=; b=ajohCkGhPvc1+9ReV/THd7QIfoVhHWyNQf3GR5dKprKVr5oYnWeGJh0kLYFtNKhPzDa4nX nE3+zi2JCoO98h/NeWQIJGLV/Cisj71ajmyEeKtbeX9w8FC50VhBUE/BuzEGeSTCKTdHhn iMaGTAuoYmBd4cwO7q5XKD1govGmi2w= X-MC-Unique: YO-C78BdPCCBYzDyR6iX6w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , Peter Maydell , Thomas Huth , David Hildenbrand , qemu-arm@nongnu.org, Cornelia Huck , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/3] target/i386: display deprecation status in '-cpu help' Date: Fri, 22 Jul 2022 13:02:22 +0100 Message-Id: <20220722120224.2311982-2-berrange@redhat.com> In-Reply-To: <20220722120224.2311982-1-berrange@redhat.com> References: <20220722120224.2311982-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658491626412100001 When the user queries CPU models via QMP there is a 'deprecated' flag present, however, this is not done for the CLI '-cpu help' command. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cornelia Huck --- target/i386/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6a57ef13af..70f78340e1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4837,6 +4837,11 @@ static void x86_cpu_list_entry(gpointer data, gpoint= er user_data) desc =3D g_strdup_printf("%s", model_id); } =20 + if (cc->model && cc->model->cpudef->deprecation_note) { + g_autofree char *olddesc =3D desc; + desc =3D g_strdup_printf("%s (deprecated)", olddesc); + } + qemu_printf("x86 %-20s %s\n", name, desc); } =20 --=20 2.36.1 From nobody Sun May 19 00:42:51 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=1658491753; cv=none; d=zohomail.com; s=zohoarc; b=EzzlsWto5oxkg2rK4J2t7dar3iuFOlCG61YhoNeMwU/N+InNLJBk5653Xv6vI0nNTxwjUxLA3rOrdKI6IuOZ8JnjqHddMRSUts18cj7gV2Sx2HjSrjeflCMk6TOow2uy4LEbdi/DUoLEeUamUCDhicBpzrqB7XD+vvK996UxG4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658491753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cNAt/9TDvnyc4cJsVRTDTFKEjNfm6Z39yfisBfBlPfc=; b=ItsOfM3tyQ2CAH1qtYgDIqocCub8XywZeiU1KjTpG1PBzhBsyHXDSgYjv+gK9SNWmUbyAVZcX7azseAO/RFpF8DwX1/fa6w8ddPZqMMVXQ8eDdamUvhuyHPRuoOV1Urz47KMsW/CJ8WHKLNr4cJ2EA8U/RMTOrjr5d5eT0RKhzY= 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 16584917538441005.7356228484445; Fri, 22 Jul 2022 05:09:13 -0700 (PDT) Received: from localhost ([::1]:52342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oErSy-0000U5-PU for importer@patchew.org; Fri, 22 Jul 2022 08:09:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMq-00005s-5b for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:35001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMY-0006Ge-CU for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:50 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-aiMkO4ZsPu-hH_qJfTdNiA-1; Fri, 22 Jul 2022 08:02:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF90E381078F; Fri, 22 Jul 2022 12:02:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA6201121314; Fri, 22 Jul 2022 12:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658491353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cNAt/9TDvnyc4cJsVRTDTFKEjNfm6Z39yfisBfBlPfc=; b=RJK7nz5Nlg8beBDctt9OeZOX4Ea3uauFff1lu6iFelZeDYr2PBWuqTUIQv4fyMto46AOf8 LWelxN+yQDSp9oYfkK8U3TBM2dZ/UAhajwu78i2V1icZcRYpWf/43vnyECKK3GwFzeQEcz Ou912WezQh6UIc1didvice7RT3oA9Ts= X-MC-Unique: aiMkO4ZsPu-hH_qJfTdNiA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , Peter Maydell , Thomas Huth , David Hildenbrand , qemu-arm@nongnu.org, Cornelia Huck , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/3] target/s390x: display deprecation status in '-cpu help' Date: Fri, 22 Jul 2022 13:02:23 +0100 Message-Id: <20220722120224.2311982-3-berrange@redhat.com> In-Reply-To: <20220722120224.2311982-1-berrange@redhat.com> References: <20220722120224.2311982-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658491754612100001 When the user queries CPU models via QMP there is a 'deprecated' flag present, however, this is not done for the CLI '-cpu help' command. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cornelia Huck --- target/s390x/cpu_models.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 1a562d2801..c3a4f80633 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -334,18 +334,31 @@ const S390CPUDef *s390_find_cpu_def(uint16_t type, ui= nt8_t gen, uint8_t ec_ga, static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_d= ata) { const S390CPUClass *scc =3D S390_CPU_CLASS((ObjectClass *)data); + CPUClass *cc =3D CPU_CLASS(scc); char *name =3D g_strdup(object_class_get_name((ObjectClass *)data)); - const char *details =3D ""; + g_autoptr(GString) details =3D g_string_new(""); =20 if (scc->is_static) { - details =3D "(static, migration-safe)"; - } else if (scc->is_migration_safe) { - details =3D "(migration-safe)"; + g_string_append(details, "static, "); + } + if (scc->is_migration_safe) { + g_string_append(details, "migration-safe, "); + } + if (cc->deprecation_note) { + g_string_append(details, "deprecated, "); + } + if (details->len) { + /* cull trailing ', ' */ + g_string_truncate(details, details->len - 2); } =20 /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] =3D 0; - qemu_printf("s390 %-15s %-35s %s\n", name, scc->desc, details); + if (details->len) { + qemu_printf("s390 %-15s %-35s (%s)\n", name, scc->desc, details->s= tr); + } else { + qemu_printf("s390 %-15s %-35s\n", name, scc->desc); + } g_free(name); } =20 --=20 2.36.1 From nobody Sun May 19 00:42:51 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=1658491669; cv=none; d=zohomail.com; s=zohoarc; b=CygwybM4wnJDLsHxTPZdOUnL4xMOAcWU/gJN1d63dQlPCPHLZzORs8tbiHbaDbtQ9ewxbQ5P17dUxPJzDteLS4E0Vr8rypkJiS4Fx2u4jdnnm+YWgdALfWgTThrIvWsDLCkZqV74aGUjNdYm/PcNvVfcowp+z5+oFyal8IlUqTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658491669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xZKA16DD5aXsXwHfgNpLOQiVvBMGOsruRHXElQl5fw8=; b=fzKLQJN0pnwmwtcWGNJkQu1O8uVhe+PEgXgL1vulrxyutsWT4HkHWizQ5swVNAvkcNlC5ymf7qAMHaYgIDIXJkIim7fjWRVl8Krztq8OVuXcz105jqpyJeTEB9ybjW+cJm2eZ9jsRD+GD1HPwrd6g+FY93ydtOkdlgHRc1UlM5s= 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 1658491669379676.9280869428029; Fri, 22 Jul 2022 05:07:49 -0700 (PDT) Received: from localhost ([::1]:49254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oErRc-0006pP-AH for importer@patchew.org; Fri, 22 Jul 2022 08:07:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMh-0008Vi-HN for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMb-0006Hk-Gc for qemu-devel@nongnu.org; Fri, 22 Jul 2022 08:02:42 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-148-2IdAds_4P4Cixdf3RmrnNw-1; Fri, 22 Jul 2022 08:02:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56625811E75; Fri, 22 Jul 2022 12:02:31 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20D831121315; Fri, 22 Jul 2022 12:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658491355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xZKA16DD5aXsXwHfgNpLOQiVvBMGOsruRHXElQl5fw8=; b=DKpnfmRWfJzX/Sc16/FgoxJhjFXyvdtPhaTm50nbu5CeJmyYjQQcKj95pWy0pXtZ6I3izL pOQLNjvDp4aZU6naf+kc+DpRN2hfud+ywZ8V5H0NSDBEVDMgAncpdliziUI2gF4cvg/m0+ UULOdOkQ/1ugXvPdrO7YEv9FivJSfAY= X-MC-Unique: 2IdAds_4P4Cixdf3RmrnNw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , Peter Maydell , Thomas Huth , David Hildenbrand , qemu-arm@nongnu.org, Cornelia Huck , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/3] target/arm: display deprecation status in '-cpu help' Date: Fri, 22 Jul 2022 13:02:24 +0100 Message-Id: <20220722120224.2311982-4-berrange@redhat.com> In-Reply-To: <20220722120224.2311982-1-berrange@redhat.com> References: <20220722120224.2311982-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658491670624100001 When the user queries CPU models via QMP there is a 'deprecated' flag present, however, this is not done for the CLI '-cpu help' command. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Cornelia Huck --- target/arm/helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 1a8b06410e..ef4e33f309 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8185,12 +8185,17 @@ static gint arm_cpu_list_compare(gconstpointer a, g= constpointer b) static void arm_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc =3D data; + CPUClass *cc =3D CPU_CLASS(oc); const char *typename; char *name; =20 typename =3D object_class_get_name(oc); name =3D g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CP= U)); - qemu_printf(" %s\n", name); + if (cc->deprecation_note) { + qemu_printf(" %s (deprecated)\n", name); + } else { + qemu_printf(" %s\n", name); + } g_free(name); } =20 --=20 2.36.1