From nobody Fri Jan 9 08:34:41 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=1766969384; cv=none; d=zohomail.com; s=zohoarc; b=GVAzp6B2yAjnwsQIcs5NWlVN/JDcjy7Uu1Wjslk7Ugi8PSmHllqVT8bktim0im1GwFhOhKya1wSHyCuHBcI7+ErxNLJEKsLex3oD4LeSK6azY0De7J7qcsY/7gkzM7kyGAbeLHtoa91pYquLMzJo7LUvalagX5gQR7HM+gw2tvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766969384; 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=n2DiFzHY+dVrGxX5QI/6RWn4/wSYw6kElVUR3y+5kzs=; b=UUOoCLR/8f0HakHeRDxTFa4Re8V35BUuVUwUtLHRCnsuJ54kz+5UhggJ+mL0H7wArsce1O/Segs+qcEOIE9h2OX8fSZCnygQBx7z2JXHecDoE/3FdY/dAAO2vrETE4NlKMsn2vlzRNEzyoiO6czo2rxWNKaEAhHQSURH1vD4RjI= 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 1766969384433892.4315782084544; Sun, 28 Dec 2025 16:49:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 7C48E41B17; Sun, 28 Dec 2025 19:49:38 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5F47343DAA; Sun, 28 Dec 2025 19:42:07 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 84D50418DD; Sun, 28 Dec 2025 18:49:30 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 513F141C9C for ; Sun, 28 Dec 2025 18:41:06 -0500 (EST) Received: from mx-prod-mc-01.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-27-1i7eApEpMxKkvZSzJwS3GQ-1; Sun, 28 Dec 2025 18:41:04 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C0D55195DE61 for ; Sun, 28 Dec 2025 23:41:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.19]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DDE9180035A for ; Sun, 28 Dec 2025 23:41:02 +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=1766965266; 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=n2DiFzHY+dVrGxX5QI/6RWn4/wSYw6kElVUR3y+5kzs=; b=TfdURYudur6X0oMikzx3PO+kdRyp5tmiWC3ouhJ8m40vGf2UbcdjW/0q+4owdbD70k5LSc LF2TvLj82DcY4PhBrYQCgGI9gPSbF0V+NCFZSpCRzgWayVmfa7XegQ0zBeL0BeGrgnCYgg gE9SxQxsIFtMQZp4oQa8bb9z8SmQH/I= X-MC-Unique: 1i7eApEpMxKkvZSzJwS3GQ-1 X-Mimecast-MFC-AGG-ID: 1i7eApEpMxKkvZSzJwS3GQ_1766965263 To: devel@lists.libvirt.org Subject: [PATCH 10/29] qemu_firmware: Fill in more information for ROMs Date: Mon, 29 Dec 2025 00:40:29 +0100 Message-ID: <20251228234048.1711701-11-abologna@redhat.com> In-Reply-To: <20251228234048.1711701-1-abologna@redhat.com> References: <20251228234048.1711701-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Law4HXieA7FSiNltUQ3fn6blPvS9-OrfoH7uVjI2X80_1766965263 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 67NDIVX62BMLT66LI2TFRJFFL6R6II45 X-Message-ID-Hash: 67NDIVX62BMLT66LI2TFRJFFL6R6II45 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: 1766969385699158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 30 +++++++++++++++++-- ...ware-auto-bios-stateless.x86_64-latest.xml | 2 +- .../firmware-auto-bios.x86_64-latest.xml | 2 +- ...-manual-efi-tdx.x86_64-latest+inteltdx.xml | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 770c886136..fc78433100 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1588,18 +1588,42 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, break; =20 case QEMU_FIRMWARE_DEVICE_MEMORY: + if ((format =3D virStorageFileFormatTypeFromString(memory->executa= ble.format)) < 0) + return -1; + if (!def->os.loader) def->os.loader =3D virDomainLoaderDefNew(); loader =3D def->os.loader; =20 loader->type =3D VIR_DOMAIN_LOADER_TYPE_ROM; - loader->format =3D VIR_STORAGE_FILE_RAW; + loader->format =3D format; + + loader->readonly =3D VIR_TRISTATE_BOOL_YES; + + if (memory->mode =3D=3D QEMU_FIRMWARE_MEMORY_MODE_STATELESS) + loader->stateless =3D VIR_TRISTATE_BOOL_YES; =20 VIR_FREE(loader->path); loader->path =3D g_strdup(memory->executable.filename); =20 - VIR_DEBUG("decided on loader '%s'", - loader->path); + if (memory->mode =3D=3D QEMU_FIRMWARE_MEMORY_MODE_SPLIT) { + /* Only fill in nvramTemplate if the NVRAM location is already + * known to be a local path or hasn't been provided, in which + * case a local path will be generated by libvirt later. + * + * We can't create or reset non-local NVRAM files, so filling + * in nvramTemplate for those would be misleading */ + VIR_FREE(loader->nvramTemplate); + loader->nvramTemplateFormat =3D VIR_STORAGE_FILE_NONE; + + if (!loader->nvram || virStorageSourceIsLocalStorage(loader->n= vram)) { + loader->nvramTemplate =3D g_strdup(memory->nvram_template.= filename); + loader->nvramTemplateFormat =3D virStorageFileFormatTypeFr= omString(memory->nvram_template.format); + } + } + + VIR_DEBUG("decided on firmware '%s' template '%s'", + loader->path, NULLSTR(loader->nvramTemplate)); break; =20 case QEMU_FIRMWARE_DEVICE_NONE: diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-late= st.xml b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.x= ml index 547dff5ed3..ca4ffb0e6c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml @@ -10,7 +10,7 @@ - /usr/share/seabi= os/bios-256k.bin + /usr/share/seabios/bios-256k.bin diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml b/t= ests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml index ae9c9f56d9..ca4ffb0e6c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml @@ -10,7 +10,7 @@ - /usr/share/seabios/bios-256k.bin + /usr/share/seabios/bios-256k.bin 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 5b87857425..6dc8496d3d 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 @@ -10,7 +10,7 @@ - /usr/share/edk2/o= vmf/OVMF.inteltdx.secboot.fd + /usr/share/edk2/ovmf/OVMF.inteltdx.secboot.fd --=20 2.52.0