From nobody Fri May 9 12:31:44 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659713094; cv=none; d=zohomail.com; s=zohoarc; b=M9IHk14/6docC4jl2RHQZqY0ncc9Pu3jO18Al0arLXxa2yqN4FQGL9dpJjy1XLdcQVLpoqPBljjQ9fZWaans1taZr6MXL882otckAbKFJNaXr7rUpDcQUkEEM80J1CyrJZ6Wl0Dr8OUJWt5veZSUkWEQDi9XV/DJEX/VGqATlfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659713094; 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=7iraYkiYx8+NSuanjcxylNLIVSYr1X7Uv5zr34EkgLk=; b=QY2/IxdOtSaBJJsDZ9w7w9kHoYQmlJnQQwHoxkOFRFQcPgxMqo110OnyRPGaZSGWWXwCItVnIHSsgdIjqnaPrC96wzeoVtYj7GE4Wk1ql1NHtB08Xl+l6LdEy07f+1CrP1nodvazSatJ8/m/8mD+zRcKqo3i0+2YRs85ULnZ9D4= 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+importer2=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 1659713094679697.7917631923093; Fri, 5 Aug 2022 08:24:54 -0700 (PDT) Received: from localhost ([::1]:59176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJzC1-00075c-Lz for importer2@patchew.org; Fri, 05 Aug 2022 11:24:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJz7z-00071N-U3 for qemu-devel@nongnu.org; Fri, 05 Aug 2022 11:20:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32626) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJz7x-0007hu-C8 for qemu-devel@nongnu.org; Fri, 05 Aug 2022 11:20: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-563-cl670GDlPHaZiIl3aSOjRQ-1; Fri, 05 Aug 2022 11:20:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 09AFD1032963; Fri, 5 Aug 2022 15:20:36 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD2CF2027EB4; Fri, 5 Aug 2022 15:20:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659712840; 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=7iraYkiYx8+NSuanjcxylNLIVSYr1X7Uv5zr34EkgLk=; b=aS7AxF+aQpDkw8pdbmoDRMKNgwRkrePI4mWB6T9u3X4MWCjaQNGm/lMegXm32xp4zHDhaE qHPUrTrW0P+nmEFoDOIHimR6mT5kSKlBwsRa8pMU0NI+WihKpnnhUBQmMJoaJPSTGp+dcv lppF4+qWo5+KHfg95voTCRN8B/3kd1g= X-MC-Unique: cl670GDlPHaZiIl3aSOjRQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: libvir-list@redhat.com, Beraldo Leal , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-arm@nongnu.org, Cornelia Huck , Gerd Hoffmann , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-s390x@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Hildenbrand , Paolo Bonzini , Wainer dos Santos Moschetta Subject: [PULL 4/6] target/s390x: display deprecation status in '-cpu help' Date: Fri, 5 Aug 2022 16:20:12 +0100 Message-Id: <20220805152014.135768-5-berrange@redhat.com> In-Reply-To: <20220805152014.135768-1-berrange@redhat.com> References: <20220805152014.135768-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.4 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+importer2=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: -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-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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659713096189100003 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. Reviewed-by: Cornelia Huck Signed-off-by: Daniel P. Berrang=C3=A9 --- 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.37.1