From nobody Sun Feb 8 17:10:14 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 1729190633129387.3417840792681; Thu, 17 Oct 2024 11:43:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 07DA213A9; Thu, 17 Oct 2024 14:43:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D5882156A; Thu, 17 Oct 2024 14:40:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1CA6E1276; Thu, 17 Oct 2024 14:40:21 -0400 (EDT) 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 608111276 for ; Thu, 17 Oct 2024 14:40:10 -0400 (EDT) Received: from mx-prod-mc-04.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-417-sw8xyZmdMLOeSuAOf4s9Mg-1; Thu, 17 Oct 2024 14:40:08 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 19A1C19560B4 for ; Thu, 17 Oct 2024 18:40:08 +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 95D2519560A2 for ; Thu, 17 Oct 2024 18:40:07 +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=1729190410; 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=fxGae1MgDhhvPJuD4qf9bqAe7O1Z7fcY8Oio9yxJJsU=; b=gq4te44PsL5EO/zwTI5UB9Ed5b3KVq1Pw6+NS/QOTffx5wjEwid7NN+59xmcHEBiGnJrQZ lKkYktuvxBJ+nH1I24IeZ8HlMfzOe38M29F94XV61GO87fqlr23rLUkRmA8SfmWJlszlsR upal32fO8Qrh78DBElFCf9r/7KrzvSU= X-MC-Unique: sw8xyZmdMLOeSuAOf4s9Mg-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 5/9] qemu: Use virCPUCompare in qemuConnectCompareHypervisorCPU directly Date: Thu, 17 Oct 2024 20:39:51 +0200 Message-ID: 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: ZMCBZNQBJLFIH5PWIVXGGA6HAEAKZGLG X-Message-ID-Hash: ZMCBZNQBJLFIH5PWIVXGGA6HAEAKZGLG 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: 1729190633736116600 Content-Type: text/plain; charset="utf-8" The function already parses CPU XML on s390. By parsing it consistently on all architecture we can switch to virCPUCompare and easily replace it with a QEMU specific helper in the following patch. Signed-off-by: Jiri Denemark --- src/qemu/qemu_driver.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62a44bf6e7..36ec0c0590 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11637,17 +11637,15 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, return VIR_CPU_COMPARE_ERROR; } =20 - if (ARCH_IS_X86(arch)) { - return virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible, - validateXML); - } + if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu, + validateXML) < 0) + return VIR_CPU_COMPARE_ERROR; + + if (ARCH_IS_X86(arch)) + return virCPUCompare(arch, hvCPU, cpu, failIncompatible); =20 if (ARCH_IS_S390(arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON)) { - if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu, - validateXML) < 0) - return VIR_CPU_COMPARE_ERROR; - if (!cpu->model) { if (cpu->mode =3D=3D VIR_CPU_MODE_HOST_PASSTHROUGH) { cpu->model =3D g_strdup("host"); --=20 2.47.0