From nobody Mon Feb 9 14:07:02 2026 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 1729190658562460.5530918677216; Thu, 17 Oct 2024 11:44:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7BA67133F; Thu, 17 Oct 2024 14:44:17 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2D3F71419; Thu, 17 Oct 2024 14:40:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BB62157A; Thu, 17 Oct 2024 14:40:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 88D031505 for ; Thu, 17 Oct 2024 14:40:12 -0400 (EDT) Received: from mx-prod-mc-05.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-524-unxri2dHMTKHYRxpPFHpBA-1; Thu, 17 Oct 2024 14:40:10 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 16DED1955E9F for ; Thu, 17 Oct 2024 18:40:10 +0000 (UTC) Received: from orkuz (unknown [10.45.224.13]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 948B319560A3 for ; Thu, 17 Oct 2024 18:40:09 +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=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729190412; 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=u9+6zfBeZEsGYAzJw+BNn3ylO3LJ6hJDamsDJE7TP+M=; b=DWI19gQbCMbSjTdyPT0Z+qjmp0hDqLlsvFfZKpaFWDUUPt+8n0B4Mqx9RAhPxnKah+7t3X 5vf1E84eHjEtLZQfhpDPq700de4IuIUnctABIDUyeyPzJV/tJqdjbCkC7veqIx5mTHmOQU Ul6w3x5rVHISKJPWymyiTW9ZRwDi0vI= X-MC-Unique: unxri2dHMTKHYRxpPFHpBA-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 6/9] qemu: Separate partial CPU check into a function Date: Thu, 17 Oct 2024 20:39:52 +0200 Message-ID: <36e6fcc5b252a7a80250fc3c62e1d5f336225270.1729190350.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UOR7V6RAEPPCEARINCIHKSFGFNHKQTMO X-Message-ID-Hash: UOR7V6RAEPPCEARINCIHKSFGFNHKQTMO 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: 1729190659890116600 Content-Type: text/plain; charset="utf-8" The new qemuDomainCheckCPU function is used as a replacement for virCPUCompare to make sure all callers use the same comparison algorithm. As a side effect qemuConnectCompareHypervisorCPU now properly reports CPU compatibility for CPU model that are considered runnable by QEMU even if our definition of the model disagrees. Signed-off-by: Jiri Denemark --- src/qemu/qemu_domain.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 +++++++ src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 7 ++----- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fda4439b0b..8ada3db115 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13223,3 +13223,43 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverConfi= g *cfg, =20 return ret; } + + +/** + * qemuDomainCheckCPU: + * @arch: CPU architecture + * @virtType: domain type (KVM vs. TCG) + * @qemuCaps: QEMU capabilities + * @cpu: CPU definition to check against "host CPU" + * @compatCPU: type of CPU used for old style check + * @failIncompatible: return an error instead of VIR_CPU_COMPARE_INCOMPATI= BLE + * + * Perform a "partial" check of the @cpu against a "host CPU". Old style c= heck + * used with all existing CPU models uses cpu_map definition of the model = in + * @cpu and compares it to the host CPU fetched @qemuCaps according to + * @compatCPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE wh= en + * the two CPUs are incompatible, VIR_CPU_COMPARE_IDENTICAL when the two C= PUs + * are identical, VIR_CPU_COMPARE_SUPERSET when the @cpu CPU is a superset= of + * the @host CPU. If @failIncompatible is true, the function will return + * VIR_CPU_COMPARE_ERROR (and set VIR_ERR_CPU_INCOMPATIBLE error) when the + * two CPUs are incompatible. + */ +virCPUCompareResult +qemuDomainCheckCPU(virArch arch, + virDomainVirtType virtType, + virQEMUCaps *qemuCaps, + virCPUDef *cpu, + virQEMUCapsHostCPUType compatCPU, + bool failIncompatible) +{ + virCPUDef *host; + + if (virQEMUCapsIsCPUUsable(qemuCaps, virtType, cpu)) + return VIR_CPU_COMPARE_SUPERSET; + + host =3D virQEMUCapsGetHostModel(qemuCaps, virtType, compatCPU); + + return virCPUCompare(arch, host, cpu, failIncompatible); +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c29ecdf238..a19314b48b 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1176,3 +1176,10 @@ int qemuDomainStorageUpdatePhysical(virQEMUDriverConfig *cfg, virDomainObj *vm, virStorageSource *src); +virCPUCompareResult +qemuDomainCheckCPU(virArch arch, + virDomainVirtType virtType, + virQEMUCaps *qemuCaps, + virCPUDef *cpu, + virQEMUCapsHostCPUType compatCPU, + bool failIncompatible); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 36ec0c0590..72211da137 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11641,8 +11641,11 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, validateXML) < 0) return VIR_CPU_COMPARE_ERROR; =20 - if (ARCH_IS_X86(arch)) - return virCPUCompare(arch, hvCPU, cpu, failIncompatible); + if (ARCH_IS_X86(arch)) { + return qemuDomainCheckCPU(arch, virttype, qemuCaps, cpu, + VIR_QEMU_CAPS_HOST_CPU_REPORTED, + failIncompatible); + } =20 if (ARCH_IS_S390(arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON)) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 72fc750d28..0815bffe3c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6268,11 +6268,8 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, virCPUFeaturePolicy removedPolicy =3D VIR_CPU_FEATURE_DISABLE; =20 if (def->cpu->check =3D=3D VIR_CPU_CHECK_PARTIAL && - !virQEMUCapsIsCPUUsable(qemuCaps, def->virtType, def->cpu) && - virCPUCompare(hostarch, - virQEMUCapsGetHostModel(qemuCaps, def->virtType, - VIR_QEMU_CAPS_HOST_CPU_F= ULL), - def->cpu, true) < 0) + qemuDomainCheckCPU(hostarch, def->virtType, qemuCaps, def->cpu, + VIR_QEMU_CAPS_HOST_CPU_FULL, true) < 0) return -1; =20 /* When starting a fresh domain we disable all features removed fr= om --=20 2.47.0