From nobody Mon Feb 9 14:33:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562086548; cv=none; d=zoho.com; s=zohoarc; b=R3WNJ0kxhtlRNsMSOdDOfXK3IMhqobm/q2F4yGggZlWG2/LnTbLWwyxDv+5NrnAbXIWXLMthJrYD2bGysJoS/nIsB9dbqEPnl5LvBjDnXYGQRxxwDnfxh2dxAckDBgJR+pPFvbA26ku7fCe76hOm9W8/xqzbvu6u0wbE0b73Q0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562086548; h=Content-Type:Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=K/rbE0AuDj5xddp69LbLZPHdAlL6rEdXaEGnrT0InHo=; b=N7aJN6GtThb/dCTu4v3Nvtf6gMw1SNg06tEwbDe8Z1vhsTQnc+NHxyKHivxc8frCrkjamo5inlUD7OHCTnGkMMv+93Vv/pJwTWI9dZKQIEzOKX/z0eIc4uB5hQ5OGeCqzI4b4eSn02MOCU4MylxJgCOHdG/gYwD2QEzUVkj5exc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562086548759389.02436185182887; Tue, 2 Jul 2019 09:55:48 -0700 (PDT) Received: from localhost ([::1]:55292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiM4H-0005Xw-O6 for importer@patchew.org; Tue, 02 Jul 2019 12:55:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38104) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKqZ-0000uI-DM for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:37:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiKqY-00071Y-57 for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:37:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiKqW-0006t7-2V for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB92C30C1AE7; Tue, 2 Jul 2019 15:37:17 +0000 (UTC) Received: from localhost (ovpn-116-30.gru2.redhat.com [10.97.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D7E53784; Tue, 2 Jul 2019 15:37:16 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , Paolo Bonzini , qemu-devel@nongnu.org, Marcel Apfelbaum , Richard Henderson Date: Tue, 2 Jul 2019 12:35:27 -0300 Message-Id: <20190702153535.9851-35-ehabkost@redhat.com> In-Reply-To: <20190702153535.9851-1-ehabkost@redhat.com> References: <20190702153535.9851-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 02 Jul 2019 15:37:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v3 34/42] i386: Get model-id from CPU object on "-cpu help" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Content-Type: text/plain; charset="utf-8" When introducing versioned CPU models, the string at X86CPUDefinition::model_id might not be the model-id we'll really use. Instantiate a CPU object and check the model-id property on "-cpu help" Signed-off-by: Eduardo Habkost Message-Id: <20190628002844.24894-4-ehabkost@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9059121273..955ea20d69 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3837,18 +3837,28 @@ static GSList *get_sorted_cpu_model_list(void) return list; } =20 +static char *x86_cpu_class_get_model_id(X86CPUClass *xc) +{ + Object *obj =3D object_new(object_class_get_name(OBJECT_CLASS(xc))); + char *r =3D object_property_get_str(obj, "model-id", &error_abort); + object_unref(obj); + return r; +} + static void x86_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc =3D data; X86CPUClass *cc =3D X86_CPU_CLASS(oc); char *name =3D x86_cpu_class_get_model_name(cc); - const char *desc =3D cc->model_description; - if (!desc && cc->cpu_def) { - desc =3D cc->cpu_def->model_id; + char *desc =3D g_strdup(cc->model_description); + + if (!desc) { + desc =3D x86_cpu_class_get_model_id(cc); } =20 qemu_printf("x86 %-20s %-48s\n", name, desc); g_free(name); + g_free(desc); } =20 /* list available CPU models and flags */ --=20 2.18.0.rc1.1.g3f1ff2140