From nobody Mon Feb 9 08:11:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602630504; cv=none; d=zohomail.com; s=zohoarc; b=nzvKnlWcHTidVEQx/FeLDgDbf8pnTwNVbR4PF9LBv/GtDQ1S0LsR2QmEkFl3TjH9xnU+dGoMFblLGEbounTKUEXVl3q2Y5XZJmdlDOaVe0W2IbBKn4B5/M7yOASr6wjNsDPA2cYtSS0Uj7niQnq/WhncbxCnd3ZqiYu3EMfXGKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602630504; 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=/NUlmtHh+wg3YX9I3nJkvoDiBlyD3K/LW9vdgi90W2E=; b=OpeE8Ib3SV6jbG6n/DO2x9LQp+g7DmlUlYbYjx6d5g6iu7mvm3CHssUhctdbvh/kVyKEq0C2Xnuu7bX1tWAPcUsdJoLwh0d5VkrvEO4GI+bvSHx6mafIFWqsVmsSQIRHIIE2VPTFjQ++muZZ6VBZCBohOowua5guds8NO7v7PNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1602630504567877.4911024400155; Tue, 13 Oct 2020 16:08:24 -0700 (PDT) Received: from localhost ([::1]:39160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSTP5-0000lo-7J for importer@patchew.org; Tue, 13 Oct 2020 19:08:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSTMI-0006S4-K0 for qemu-devel@nongnu.org; Tue, 13 Oct 2020 19:05:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59031) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSTMF-0003a7-82 for qemu-devel@nongnu.org; Tue, 13 Oct 2020 19:05:28 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-LfAEKcXSPtSzUnvCpPx-Ig-1; Tue, 13 Oct 2020 19:05:22 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2039801FDA; Tue, 13 Oct 2020 23:05:19 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 993DF55790; Tue, 13 Oct 2020 23:05:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602630325; 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=/NUlmtHh+wg3YX9I3nJkvoDiBlyD3K/LW9vdgi90W2E=; b=Ud8hNeM+k/GXOwQSViN3iVlgQxRnLrDgBpMQlsKPoEsXrZdKNHKydirbh3uG+4/Dq2j03U QRJRwxX7ErINhFcrmMxSH3F/BubFkU2SwMRTmE3+G3qvLWnIRap9DtV68ni3ZWjjxkfKqe CSb4dnFWwXJ89X+xy5qCr9Ia5Dar7pY= X-MC-Unique: LfAEKcXSPtSzUnvCpPx-Ig-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 2/7] i386: Add X86CPUModel.alias_of field Date: Tue, 13 Oct 2020 19:04:52 -0400 Message-Id: <20201013230457.150630-3-ehabkost@redhat.com> In-Reply-To: <20201013230457.150630-1-ehabkost@redhat.com> References: <20201013230457.150630-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/13 19:05:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand , Thomas Huth , Markus Armbruster , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Eduardo Habkost , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Cleber Rosa , Jiri Denemark , David Gibson , "Daniel P. Berrange" , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Instead of calling x86_cpu_class_get_alias_of(), just save the actual CPU model name in X86CPUModel and use it in `-cpu help`. Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9eafbe3690..43e633ddd3 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1647,6 +1647,12 @@ struct X86CPUModel { * This matters only for "-cpu help" and query-cpu-definitions */ bool is_alias; + /* + * Valid only if is_alias is true. + * If NULL, actual alias depend on machine type. + * If not NULL, name of actual CPU model this is an alias to. + */ + const char *alias_of; }; =20 /* Get full model name for CPU version */ @@ -4927,14 +4933,13 @@ static void x86_cpu_list_entry(gpointer data, gpoin= ter user_data) X86CPUClass *cc =3D X86_CPU_CLASS(oc); g_autofree char *name =3D x86_cpu_class_get_model_name(cc); g_autofree char *desc =3D g_strdup(cc->model_description); - g_autofree char *alias_of =3D x86_cpu_class_get_alias_of(cc); g_autofree char *model_id =3D x86_cpu_class_get_model_id(cc); =20 - if (!desc && alias_of) { - if (cc->model && cc->model->version =3D=3D CPU_VERSION_AUTO) { + if (!desc && cc->model && cc->model->is_alias) { + if (!cc->model->alias_of) { desc =3D g_strdup("(alias configured by machine type)"); } else { - desc =3D g_strdup_printf("(alias of %s)", alias_of); + desc =3D g_strdup_printf("(alias of %s)", cc->model->alias_of); } } if (!desc && cc->model && cc->model->note) { @@ -5418,6 +5423,7 @@ static void x86_register_cpudef_types(X86CPUDefinitio= n *def) m->cpudef =3D def; m->version =3D CPU_VERSION_AUTO; m->is_alias =3D true; + m->alias_of =3D NULL; /* depends on machine type */ x86_register_cpu_model_type(def->name, m); =20 /* Versioned models: */ @@ -5436,6 +5442,7 @@ static void x86_register_cpudef_types(X86CPUDefinitio= n *def) am->cpudef =3D def; am->version =3D vdef->version; am->is_alias =3D true; + am->alias_of =3D g_strdup(name); x86_register_cpu_model_type(vdef->alias, am); } } --=20 2.28.0