From nobody Fri Jan 9 09: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; 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=1766968303; cv=none; d=zohomail.com; s=zohoarc; b=T0JkVFxOjv8oKNb28BfXp9NQ2MY8GQoq78NIW+jSripGRxBrv62XaeWIo8w9vfGhxllSqh+MOShQvkEgTNrNO7R+r1f9ChMSgnY1lom8uuVbR/G7TGyohDVoTY1S6i6Kwg2gJF7bn/gFXJY8VSA7bOQS+Nmdng4yBgRt4KsTIBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766968303; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=A3VoiKgzVu2teU1sBfii7O1VBsOMlHjQHzBEgR/rhwc=; b=RfJ0TPm6875iyB4nkzuHPd1UadxUKFkJ8938lCJYWSZGqyeCQV9kNxshVGnGT9cot0hytAjTpPPPI0gLLr2eCeo2uQhqM8mBKZf/NM/VGnLOpI5DB+WOcuXnsfc8zx0jiz1aPykf7ujtOzLZY7JSSWBTBsOzPTuFxNRx5WndYxw= 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 1766968303019174.5467486688607; Sun, 28 Dec 2025 16:31:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8C19C3F323; Sun, 28 Dec 2025 19:31:36 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CC3CA418CE; Sun, 28 Dec 2025 19:21:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 22012417EB; Sun, 28 Dec 2025 18:35:00 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2FCE93F2B4 for ; Sun, 28 Dec 2025 18:34:59 -0500 (EST) 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-570-EIEinsIkOkWNvR4d0u_CnQ-1; Sun, 28 Dec 2025 18:34:57 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 8799C1800342 for ; Sun, 28 Dec 2025 23:34:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C98A830001A8 for ; Sun, 28 Dec 2025 23:34:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766964898; 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=A3VoiKgzVu2teU1sBfii7O1VBsOMlHjQHzBEgR/rhwc=; b=QYX7/Ws7lL40iyMRnubfTAWDBfkiQSYLk3r7nZtF+hAO8lYCH0Et0b7PVGx1x/Tv+fpUJ9 IWUTG0QlHPQA9WWuM2F3Yx1ejbbKeVeI7ecWnXGjxF7Vs8S93X4//hKPYykclYJsVdvq0g LxiJnUA/zUUuLQ/xXHqM86VPxjQJNtM= X-MC-Unique: EIEinsIkOkWNvR4d0u_CnQ-1 X-Mimecast-MFC-AGG-ID: EIEinsIkOkWNvR4d0u_CnQ_1766964896 To: devel@lists.libvirt.org Subject: [PATCH 34/36] qemu_firmware: Don't skip autoselection for ROM Date: Mon, 29 Dec 2025 00:34:10 +0100 Message-ID: <20251228233412.1709869-35-abologna@redhat.com> In-Reply-To: <20251228233412.1709869-1-abologna@redhat.com> References: <20251228233412.1709869-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dMm089hL-_PeezyHMGJGJcX6s0ibGFt0U14ThZwM1U0_1766964896 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GMPYGAOZLSERPKOAOSW7SQAWCL5Q463W X-Message-ID-Hash: GMPYGAOZLSERPKOAOSW7SQAWCL5Q463W X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1766968304287158500 Content-Type: text/plain; charset="utf-8"; x-default="true" It's possible to have firmware descriptors for builds intended to be loaded as ROM, as is the case for those loaded as pflash. There is no reason to skip firmware autoselection in those cases, and doing so prevents useful information from being filled in. After this change, the firmware-manual-efi-tdx test case is augmented with some additional information. Even more information will be filled in later, when we improve the matching logic. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 10 ++++------ .../firmware-manual-efi-tdx.x86_64-latest+inteltdx.xml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 9ba5d899fa..7953b297bc 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1913,13 +1913,11 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, return -1; } =20 - /* If firmware autoselection is disabled and the loader is a ROM - * instead of a PFLASH device, then we're using BIOS and we don't - * need any information at all */ - if (!autoSelection && - (!loader || (loader && loader->type =3D=3D VIR_DOMAIN_LOADER_TYPE_= ROM))) { + /* If firmware autoselection is disabled and no information + * related to the loader was provided, then we're using the + * default built-in firmware and we can stop here */ + if (!autoSelection && !loader) return 0; - } =20 /* Look for the information we need in firmware descriptors */ if ((ret =3D qemuFirmwareFillDomainModern(driver, def)) < 0) diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+in= teltdx.xml b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+in= teltdx.xml index 7428a3dfef..cdb92dcf1d 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.= xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.= xml @@ -6,7 +6,7 @@ 1 hvm - /usr/share/edk2/ovmf/OVMF.intelt= dx.secboot.fd + /usr/share/edk2/o= vmf/OVMF.inteltdx.secboot.fd --=20 2.52.0