From nobody Mon Sep 8 17:12:43 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1753787323; cv=none; d=zohomail.com; s=zohoarc; b=QM/mnJ2+kTq5urhDVuESh9ZaLsUwBFuxhcQnFqWgzaVbZlfXksDkPFIVxgLXNIMQ5ZfiGy7OktAUtKCtiF43USZHCxBDJ/+xbyYeKNqHOd1bkTIYepkQlguK32I1eoj4sRZqbGH9EeAeWJ/YJSQOSwAtdH5gHbkAW/34yrGKqZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753787323; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=ObBG9yFvB0SrztPPHvLZ7s4N/+Xv0f/d0zvTKr0q33A=; b=efgVd4FS5hjxFHED/c6x1/wpih6Zti77bCnIfFHtCCmWjd59AT2NJeX56IrK/drEuSNmIDUY1ashGXfPiK5VOrywGP7UcGjywI3jiM2Nz/UFvaZoGJFKwycN6TvPlrUT3jJ0/B+iTVU93c1SmCMgD9+EruiPWf44LOBtVUyWwx0= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17537873235711013.9922015495406; Tue, 29 Jul 2025 04:08:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 90FC511C8; Tue, 29 Jul 2025 07:08:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 09614D76; Tue, 29 Jul 2025 07:07:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0FB25BA6; Tue, 29 Jul 2025 07:07:40 -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 2FCB6BC1 for ; Tue, 29 Jul 2025 07:07:39 -0400 (EDT) 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-282-kX8cglWyN72QGacnl1IZdA-1; Tue, 29 Jul 2025 07:07:37 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 4B94A19560BA for ; Tue, 29 Jul 2025 11:07:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.29]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 35FB4180035E; Tue, 29 Jul 2025 11:07:34 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS 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=1753787258; 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=JqqS3YgPp4VxU6Pckg09q+FlBJD0ZKDlp3ZyOFIrTn8=; b=FpbLcvwqUtGn3sLXgmxonp0J1RcZGRtxaLGw9+uP9xJX4ms8z3JZ5ltmqGvUuwmUREsGiz RG4kQXsI0B9g5Nb0uKnE02aukyMAOjKoQlMUVJnc0pEUGmE7cO2mi46xuSeSXDpwkzgeld /z1LURXNgmHM/XKm1r4k3dUP1spPtxE= X-MC-Unique: kX8cglWyN72QGacnl1IZdA-1 X-Mimecast-MFC-AGG-ID: kX8cglWyN72QGacnl1IZdA_1753787256 To: devel@lists.libvirt.org Subject: [PATCH 1/2] Revert "qemuxmlconfdata: Regenerate outputs after last commit" Date: Tue, 29 Jul 2025 13:07:28 +0200 Message-ID: <3464ed73e7f17ff3abe6bb14172429a3832548b7.1753787210.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: S97X3uArNCV8AceKAZ8nXjUf4IBUIx68Yg-ANszhLsQ_1753787256 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XQSG44PYMD4YEGRQN4Z52T4ELVGXWKEV X-Message-ID-Hash: XQSG44PYMD4YEGRQN4Z52T4ELVGXWKEV X-MailFrom: pkrempa@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 CC: Peter Krempa 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1753787325337116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Turns out the test difference was not caused by forgotten hunks but rather that the test output depends on the system. For now both this wrong fix and the commit causing the failure will both be reverted as we're in code freeze for the upcoming release. This reverts commit 73345ccc7bca1044d57391a5e676db1e700452e8. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- ...manual-efi-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...-manual-efi-aarch64-legacy-paths.aarch64-latest.xml | 10 +++------- ...fi-no-enrolled-keys-legacy-paths.x86_64-latest.args | 2 +- ...efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml | 10 +++------- ...nual-efi-no-secboot-legacy-paths.x86_64-latest.args | 2 +- ...anual-efi-no-secboot-legacy-paths.x86_64-latest.xml | 10 +++------- ...al-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +- ...-manual-efi-secboot-legacy-paths.x86_64-latest.args | 2 +- ...e-manual-efi-secboot-legacy-paths.x86_64-latest.xml | 10 +++------- 9 files changed, 17 insertions(+), 33 deletions(-) diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths= .aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-le= gacy-paths.aarch64-latest.args index 7bf2aeb570..83b1ce46ab 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-s= ilent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":tr= ue,"discard":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ -machine virt-4.0,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-b= ackend=3Dmach-virt.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-p= flash1-storage,acpi=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths= .aarch64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-leg= acy-paths.aarch64-latest.xml index 0ee421fe6f..2e5c4fe584 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.xml @@ -4,14 +4,10 @@ 1048576 1048576 1 - + hvm - - - - - /usr/share/edk= 2/aarch64/QEMU_EFI-silent-pflash.raw - /var/lib/libvirt/qemu/nvram/guest_VARS= .fd + /usr/share/AAV= MF/AAVMF_CODE.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no= -enrolled-keys-legacy-paths.x86_64-latest.args index 3718373af1..1bbba7e99f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ -machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-= enrolled-keys-legacy-paths.x86_64-latest.xml index 4bfc7cdd0c..b452ebaca2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.xml @@ -4,14 +4,10 @@ 1048576 1048576 1 - + hvm - - - - - /usr/share/edk2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /usr/share/OVMF/OVMF_CODE.secboot.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secbo= ot-legacy-paths.x86_64-latest.args index d1b0377986..2113a46e80 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.fd"= ,"node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ -machine pc-q35-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-storage,acpi= =3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboo= t-legacy-paths.x86_64-latest.xml index 490e298f7f..83623f1de2 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.xml @@ -4,14 +4,10 @@ 1048576 1048576 1 - + hvm - - - - - /usr/share/edk= 2/ovmf/OVMF_CODE.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /usr/share/OVM= F/OVMF_CODE.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-= template-nonstandard.x86_64-latest.xml index beb146d35a..cbadd0f0c8 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.xml @@ -7,7 +7,7 @@ hvm /usr/share/edk= 2/ovmf/OVMF_CODE.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /var/lib/libv= irt/qemu/nvram/guest_VARS.fd diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-leg= acy-paths.x86_64-latest.args index 3718373af1..1bbba7e99f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ --blockdev '{"driver":"file","filename":"/usr/share/edk2/ovmf/OVMF_CODE.sec= boot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"disca= rd":"unmap"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_= VARS.fd","node-name":"libvirt-pflash1-storage","read-only":false}' \ -machine pc-q35-10.0,usb=3Doff,smm=3Don,dump-guest-core=3Doff,memory-backe= nd=3Dpc.ram,pflash0=3Dlibvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-stor= age,acpi=3Don \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-lega= cy-paths.x86_64-latest.xml index 41e5742c21..44d200134b 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.xml @@ -4,14 +4,10 @@ 1048576 1048576 1 - + hvm - - - - - /usr/share/edk2/ovmf/OVMF_CODE.secboot.fd - /var/lib/libvirt/qemu/nvram/guest_VARS.fd + /usr/share/OVMF/OVMF_CODE.secboot.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd --=20 2.50.0 From nobody Mon Sep 8 17:12:43 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1753787345; cv=none; d=zohomail.com; s=zohoarc; b=G2FdBcqQgafleamu+i14HhzGdoKGvqV3HQ+fBI06eODVyoISRNQUM9tlEHBC0r9q3SSXoSud+/8rirQ6KB1EtY/bS2tSCkBg3V9CqpIBDiWrkKLMkWtOA2a5U9U+TDu1YsqOfCceJhXqhKYMXoyjF2tSBsJVtSoLouqlUKjQqHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753787345; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=AH8gGeEKstYRunSppKKRR+uNMXkRVcn6oEymDA/oa+I=; b=W2mvQGzYBRQA5b/RZSYH2AoFX5MMC6AFHc2YRj7ilSatVSpNutHZHpLB1/QoLLSj0YCYlFAWUqFjHnSsEn1dlXmPXJA3y/A4t+Vjuw9uZ6m1H8KLH+9wgbDQBroDhrA+YQy0Xdgw6O+XDuUEcGsF1Dhq7tfd1Fmlm+JrrZiUlLw= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1753787345476297.0028071728425; Tue, 29 Jul 2025 04:09:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 80B6DD46; Tue, 29 Jul 2025 07:09:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1D8A611F1; Tue, 29 Jul 2025 07:07:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5DEAEC6B; Tue, 29 Jul 2025 07:07:41 -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 CD337BA6 for ; Tue, 29 Jul 2025 07:07:40 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-02N9nKl4NoKx1ZeWt2gZ2g-1; Tue, 29 Jul 2025 07:07:38 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D74A81800873 for ; Tue, 29 Jul 2025 11:07:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.29]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CDBAD1800B69; Tue, 29 Jul 2025 11:07:36 +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.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS 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=1753787260; 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=uCLkTzylzFgOQG8x3+9XjzsoA0VMOI8NQLqDfrSgTYU=; b=ID8FyTrTm6w0T8VNLfy8RPmoKQIOohsMRhFfMdlmFYdAlCTbvvx2OjX0VJglt9ZZSFmdO0 FJ7ComaeegpTzQmpAVMAumVsdTMI2I+DJUx1rCh1qX68xaOieXE1eGfU472d6hbtJ9DtRi eXHDDNbSwjOk7tf4/iLxvhHCZi3Km1s= X-MC-Unique: 02N9nKl4NoKx1ZeWt2gZ2g-1 X-Mimecast-MFC-AGG-ID: 02N9nKl4NoKx1ZeWt2gZ2g_1753787257 To: devel@lists.libvirt.org Subject: [PATCH 2/2] Revert "qemu: Match firmware with fully resolved and canonicalized paths" Date: Tue, 29 Jul 2025 13:07:29 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: huKu1bz_u6caTaumrc2zYdjE64XjgaPs93SRram5jFk_1753787257 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CXNDVHID3A6PBE6IJMRDBZPEZSO7H63Z X-Message-ID-Hash: CXNDVHID3A6PBE6IJMRDBZPEZSO7H63Z X-MailFrom: pkrempa@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 CC: Peter Krempa 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: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1753787347393116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The canonicalization of the paths is not mocked properly and thus the tests depend on the host system. While the tests do pass on our CI they break on real deployments at least on Fedora 42. Since we're in code freeze for the upcoming release, revert the patch instead of attempts to fix it. This reverts commit 4efea21ae8709c6741a1800bd26ae6b49c8a77f5. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_firmware.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 69e77d66f5..f10137144e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -33,7 +33,6 @@ #include "viralloc.h" #include "virenum.h" #include "virstring.h" -#include "virfile.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -940,23 +939,23 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw, switch (fw->mapping.device) { case QEMU_FIRMWARE_DEVICE_FLASH: if (loader && loader->path && - !virFileComparePaths(loader->path, flash->executable.filename)) + STRNEQ(loader->path, flash->executable.filename)) return false; if (loader && loader->nvramTemplate) { if (flash->mode !=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) return false; - if (!virFileComparePaths(loader->nvramTemplate, flash->nvram_t= emplate.filename)) + if (STRNEQ(loader->nvramTemplate, flash->nvram_template.filena= me)) return false; } break; case QEMU_FIRMWARE_DEVICE_MEMORY: if (loader && loader->path && - !virFileComparePaths(loader->path, memory->filename)) + STRNEQ(loader->path, memory->filename)) return false; break; case QEMU_FIRMWARE_DEVICE_KERNEL: if (kernelPath && - !virFileComparePaths(kernelPath, kernel->filename)) + STRNEQ(kernelPath, kernel->filename)) return false; break; case QEMU_FIRMWARE_DEVICE_NONE: @@ -1677,7 +1676,7 @@ qemuFirmwareFillDomainLegacy(virQEMUDriver *driver, for (i =3D 0; i < cfg->nfirmwares; i++) { virFirmware *fw =3D cfg->firmwares[i]; - if (!virFileComparePaths(fw->name, loader->path)) { + if (STRNEQ(fw->name, loader->path)) { VIR_DEBUG("Not matching loader path '%s' for user provided pat= h '%s'", fw->name, loader->path); continue; --=20 2.50.0