From nobody Thu Jul 3 22:38:06 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622571395; cv=none; d=zohomail.com; s=zohoarc; b=e6rXSNRcBr6Y4FQxIHvnYH94KAhYgHSC+4meaP9GxpuRIcYMkcffcWtkSeYS8wsdh9dsGoVwySCdI1+cYevEQdEyGciuwGD22l6x5Z+TYGocVMCgjmAar+qvbQ3Qy8qt1Vejll6zeGtKOqUtCvoqOCVhpgW2o5dSq9asAWeDNCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622571395; 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=qgKA1qVKIUY9RsaKnKk+R88Xea2tiVqPTmJYKjufpGg=; b=V/msiXYwhJBFg+T0s1UYoZiRqqrAO1PyutOxtp7aVxYHK5b/8epcr5A91DRphKI6pnEP97JASKDr0sByWk5264a0SPYtG36QU37EOMx/6i05rBKcWT7jOQjk1Vw2CdQo9l8w/7H2OZZQxKweN9cjGCiu+LhTlZ20zv5lXgy/yfo= 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+importer2=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 1622571395294532.9239578250883; Tue, 1 Jun 2021 11:16:35 -0700 (PDT) Received: from localhost ([::1]:56294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lo8wM-0007pH-Az for importer2@patchew.org; Tue, 01 Jun 2021 14:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo8qN-0001ui-GH for qemu-devel@nongnu.org; Tue, 01 Jun 2021 14:10:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lo8qL-0005Z7-QG for qemu-devel@nongnu.org; Tue, 01 Jun 2021 14:10:23 -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-208-hlY8KXMSN2KWSOnRz_QI1Q-1; Tue, 01 Jun 2021 14:10:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 817D91009460; Tue, 1 Jun 2021 18:10:18 +0000 (UTC) Received: from localhost (ovpn-112-239.rdu2.redhat.com [10.10.112.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C21B60CC5; Tue, 1 Jun 2021 18:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622571021; 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=qgKA1qVKIUY9RsaKnKk+R88Xea2tiVqPTmJYKjufpGg=; b=CEEVaa4mhFt7HEU6lZFb1EYA/okdhjvRUXURg3TcKRzqV9ov9ikQd1nUx2Y3MgBRjuRFTX 32fChA/YMubWLSfkNSr8hZy+WoCqUVl6Dq84CP7yocHWzlS+FcrcVGfh3Af4Pkvgiq/a3s sDwZASsXBBSPZb+wSIBrCkHJ3NDqY/w= X-MC-Unique: hlY8KXMSN2KWSOnRz_QI1Q-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 04/24] target/i386/cpu: Constify X86CPUDefinition Date: Tue, 1 Jun 2021 14:09:54 -0400 Message-Id: <20210601181014.2568861-5-ehabkost@redhat.com> In-Reply-To: <20210601181014.2568861-1-ehabkost@redhat.com> References: <20210601181014.2568861-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: text/plain; charset="utf-8" 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Paolo Bonzini , Richard Henderson , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210503173524.833052-3-philmd@redhat.com> Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 065d40fd3e0..ff92d924ad9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1589,7 +1589,7 @@ typedef struct X86CPUDefinition { /* Reference to a specific CPU model version */ struct X86CPUModel { /* Base CPU definition */ - X86CPUDefinition *cpudef; + const X86CPUDefinition *cpudef; /* CPU model version */ X86CPUVersion version; const char *note; @@ -1601,14 +1601,15 @@ struct X86CPUModel { }; =20 /* Get full model name for CPU version */ -static char *x86_cpu_versioned_model_name(X86CPUDefinition *cpudef, +static char *x86_cpu_versioned_model_name(const X86CPUDefinition *cpudef, X86CPUVersion version) { assert(version > 0); return g_strdup_printf("%s-v%d", cpudef->name, (int)version); } =20 -static const X86CPUVersionDefinition *x86_cpu_def_get_versions(X86CPUDefin= ition *def) +static const X86CPUVersionDefinition * +x86_cpu_def_get_versions(const X86CPUDefinition *def) { /* When X86CPUDefinition::versions is NULL, we register only v1 */ static const X86CPUVersionDefinition default_version_list[] =3D { @@ -1797,7 +1798,7 @@ static const CPUCaches epyc_milan_cache_info =3D { * PT in VMX operation */ =20 -static X86CPUDefinition builtin_x86_defs[] =3D { +static const X86CPUDefinition builtin_x86_defs[] =3D { { .name =3D "qemu64", .level =3D 0xd, @@ -5061,7 +5062,7 @@ static void x86_cpu_apply_version_props(X86CPU *cpu, = X86CPUModel *model) */ static void x86_cpu_load_model(X86CPU *cpu, X86CPUModel *model) { - X86CPUDefinition *def =3D model->cpudef; + const X86CPUDefinition *def =3D model->cpudef; CPUX86State *env =3D &cpu->env; FeatureWord w; =20 @@ -5148,7 +5149,7 @@ static void x86_register_cpu_model_type(const char *n= ame, X86CPUModel *model) type_register(&ti); } =20 -static void x86_register_cpudef_types(X86CPUDefinition *def) +static void x86_register_cpudef_types(const X86CPUDefinition *def) { X86CPUModel *m; const X86CPUVersionDefinition *vdef; --=20 2.30.2