From nobody Thu Dec 5 02:04:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1732311725791568.9031907421798; Fri, 22 Nov 2024 13:42:05 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 352DA1B89; Fri, 22 Nov 2024 16:42:05 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A28DD168A; Fri, 22 Nov 2024 16:34:39 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 85CC21528; Fri, 22 Nov 2024 16:34:27 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 32D641612 for ; Fri, 22 Nov 2024 16:33:52 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-377-5MOixibWM267gMPOc1Fp-A-1; Fri, 22 Nov 2024 16:33:50 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A9FB219560BE for ; Fri, 22 Nov 2024 21:33:49 +0000 (UTC) Received: from orkuz (unknown [10.45.224.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2E1511955E9E for ; Fri, 22 Nov 2024 21:33:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732311231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=riP+isETdWjewONRlRCCbWlhfqxvgka915Z/bTdGEx8=; b=MvQ6q+1trVEXhEwyqSoY6Ds/fQHmhN969adX/el9QlRwaoz3FRNgRvXpx4L2eIxAhEq1UR hJRJIAnY9ZCXvFv7bUst2iZxxE6Bh/zG2uy0D4r4fYKxSQiBaiLP55AD8bkKMFmbEeXH9j zsaLkJcXGRVIdPcHDcg2OOIIwB/6zdM= X-MC-Unique: 5MOixibWM267gMPOc1Fp-A-1 X-Mimecast-MFC-AGG-ID: 5MOixibWM267gMPOc1Fp-A From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH v2 14/36] cpu: Introduce virCPUGetCanonicalModel Date: Fri, 22 Nov 2024 22:32:54 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Jou3_1ACU_D2ePO-GJHpxdNAM5_fLbzTa0NL2whQAoY_1732311229 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UO3SFMUDVFNJHA7NT2O3LX4FYYAR3ZT4 X-Message-ID-Hash: UO3SFMUDVFNJHA7NT2O3LX4FYYAR3ZT4 X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1732311727155116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrang=C3=A9 --- Notes: Version 2: - new patch src/cpu/cpu.c | 25 +++++++++++++++++++++++++ src/cpu/cpu.h | 8 ++++++++ src/cpu/cpu_x86.c | 19 +++++++++++++++++++ src/libvirt_private.syms | 1 + 4 files changed, 53 insertions(+) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 2b0d641e78..ef515744ba 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -1345,6 +1345,31 @@ virCPUGetCheckMode(virArch arch, } =20 =20 +/** virCPUGetCanonicalModel: + * + * @arch: CPU architecture + * @model: CPU model to be checked + * + * Returns @model's canonical name if @model is an alias or NULL otherwise. + */ +const char * +virCPUGetCanonicalModel(virArch arch, + const char *model) +{ + struct cpuArchDriver *driver; + + VIR_DEBUG("arch=3D%s model=3D%s", virArchToString(arch), model); + + if (!(driver =3D cpuGetSubDriver(arch))) + return NULL; + + if (!driver->getCanonicalModel) + return NULL; + + return driver->getCanonicalModel(model); +} + + /** * virCPUArchIsSupported: * diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index ff68c5da2d..fc6a812eaa 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -140,6 +140,9 @@ typedef int (*virCPUArchGetCheckMode)(const char *modelName, bool *compat); =20 +typedef const char * +(*virCPUArchGetCanonicalModel)(const char *model); + struct cpuArchDriver { const char *name; const virArch *arch; @@ -168,6 +171,7 @@ struct cpuArchDriver { virCPUArchDataIsIdentical dataIsIdentical; virCPUArchDataGetHost dataGetHost; virCPUArchGetCheckMode getCheckMode; + virCPUArchGetCanonicalModel getCanonicalModel; }; =20 =20 @@ -324,6 +328,10 @@ virCPUGetCheckMode(virArch arch, const virCPUDef *cpu, bool *compat); =20 +const char * +virCPUGetCanonicalModel(virArch arch, + const char *model); + bool virCPUArchIsSupported(virArch arch); =20 diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index ce3506be55..13695802da 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3697,6 +3697,24 @@ virCPUx86GetCheckMode(const char *modelName, } =20 =20 +static const char * +virCPUx86GetCanonicalModel(const char *modelName) +{ + virCPUx86Map *map; + virCPUx86Model *model; + + if (!(map =3D virCPUx86GetMap())) + return NULL; + + model =3D x86ModelFind(map, modelName); + + if (!model || !model->canonical) + return NULL; + + return model->canonical->name; +} + + struct cpuArchDriver cpuDriverX86 =3D { .name =3D "x86", .arch =3D archs, @@ -3730,4 +3748,5 @@ struct cpuArchDriver cpuDriverX86 =3D { .dataGetHost =3D virCPUx86DataGetHost, #endif .getCheckMode =3D virCPUx86GetCheckMode, + .getCanonicalModel =3D virCPUx86GetCanonicalModel, }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b9b44ef96..2a9d3230e1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1543,6 +1543,7 @@ virCPUDataNewCopy; virCPUDataParse; virCPUDataParseNode; virCPUExpandFeatures; +virCPUGetCanonicalModel; virCPUGetCheckMode; virCPUGetHost; virCPUGetHostIsSupported; --=20 2.47.0