Received: by 2002:ac2:596f:0:0:0:0:0 with SMTP id h15csp231992lfp; Fri, 22 Jul 2022 05:06:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tv5qlMitJHHnnFbJYOX7bal40fWfho2YmUBpMBdIaSff7TTpLLAKr2saI4pMTTwbaUIwNa X-Received: by 2002:a05:620a:270d:b0:6b5:d076:1c55 with SMTP id b13-20020a05620a270d00b006b5d0761c55mr230478qkp.43.1658491569067; Fri, 22 Jul 2022 05:06:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658491569; cv=none; d=google.com; s=arc-20160816; b=RpoIngXpPizYjIWDWOFRo/DpiyJtw9HvDI/yoVV0phBllhF78VsA1amdR6+Z/CnE9G LvRV+C7/9q8uAtp0dI9Db5ls8KLUXxjOdvpNHrHsU6TZ9tfZJQUaEC7hsX7UbqVd+upz ml9iyJuDnbLqgHBoFIYEQAWrg3p4xKeN0c7BXYDh/cU0AsNOTScRQAa/q8dDsMd0wG+a uSL9eR6gEerdEIJFTSTO599QVvZqMmK133mEXiaEz2tALZoBVwQn2rUVjY0hg/p1fzxj SWPBRE4yxrnyR8UhAkG/E8FUDmBELxOePssmb3vyCWPkJvEPe5vyEsXKcDSZqmuqbn4G xY3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cNAt/9TDvnyc4cJsVRTDTFKEjNfm6Z39yfisBfBlPfc=; b=U9oveZh78NWOlbPla952sWbzYWeYlWfd7lCIW0+zPHdxr79eCpkxwPe039MgzgNUiQ Gh7kAMIzNgMHBfAYpjEaJmO1O3hfmYO33MS0XM9zJjBkjDJY/q4IIIhIcN85Dhq3X37q WOs61zckm/C/c0sgFkH8Q7y/YmIw3BO27Tje6Jl5ZEN7mSErkjtu7/0ERJLGiQ7FqLRG 4R6LDaeW/uuaKKECdrKYBorHQNS53naUfJJ38xot9MdB8dQgrfHyQnh/98UQj595h8F0 Jrr0QD5lMFDpGsb8xpLqM2yU5Z1JOdn6n3LoOEDndPL0yIK4hW6Kh4WJKLt6m9ae0TvW Bxcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RJK7nz5N; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f21-20020ac87f15000000b0031ee17efc2bsi3191720qtk.323.2022.07.22.05.06.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Jul 2022 05:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RJK7nz5N; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:45966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oErQ0-0004Qd-JQ for alex.bennee@linaro.org; Fri, 22 Jul 2022 08:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMb-0008OQ-F9 for qemu-arm@nongnu.org; Fri, 22 Jul 2022 08:02:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oErMY-0006Gb-5g for qemu-arm@nongnu.org; Fri, 22 Jul 2022 08:02:37 -0400 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= 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 X-MC-Unique: aiMkO4ZsPu-hH_qJfTdNiA-1 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) 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: 8bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: bxai7E7zsIok 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é --- 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, uint8_t gen, uint8_t ec_ga, static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data) { const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data); + CPUClass *cc = CPU_CLASS(scc); char *name = g_strdup(object_class_get_name((ObjectClass *)data)); - const char *details = ""; + g_autoptr(GString) details = g_string_new(""); if (scc->is_static) { - details = "(static, migration-safe)"; - } else if (scc->is_migration_safe) { - details = "(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); } /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 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->str); + } else { + qemu_printf("s390 %-15s %-35s\n", name, scc->desc); + } g_free(name); } -- 2.36.1