From nobody Fri Jan 9 08:52:43 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=1766967221; cv=none; d=zohomail.com; s=zohoarc; b=nKMhrjxfwNGBEc4Erb7WhweE6pRWLaoqtY3b3INg81zAXaKALIrTYdA5ciN4exxNnD5N0Ime1qi+ESRgxnaGf3fd7IR5kjKKplUr9PkMU+dGpU85qTsIx4kwRONaOBXGmVjUcXiBran73vJObk1Wc+4RSniU8gZH9PUwsOOGKmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766967221; 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=gk0yOqJeXRkcpj9q26wI0nIkRShRkOEvBiGhcjsp4FQ=; b=e5W0G4L2rbhCOUpZt3SBb2F6Uo0r4XLeBDS57iQKA4tnUeCqd35HdH0tekXjt0yvD+Ap9QuvwL39RV+qACANS9T2Kkh18+Ug0nIvCEYPPQiPY6kZp4cUGkvxtj14cvZAFH5545qrQOlFoL7TZEc1Ju7R2CeooqzwpE7jwQs8nTI= 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 1766967221478248.3035565127101; Sun, 28 Dec 2025 16:13:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5584E4192A; Sun, 28 Dec 2025 19:13:38 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D3BEF41ADC; Sun, 28 Dec 2025 19:00:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id D153F417EB; Sun, 28 Dec 2025 18:34:46 -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 DE2223F2B4 for ; Sun, 28 Dec 2025 18:34:45 -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-310-GirlsiMBOcWwxDeJyvsIgw-1; Sun, 28 Dec 2025 18:34:44 -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 45EEE1800378 for ; Sun, 28 Dec 2025 23:34:43 +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 872F930001A8 for ; Sun, 28 Dec 2025 23:34:42 +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=1766964885; 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=gk0yOqJeXRkcpj9q26wI0nIkRShRkOEvBiGhcjsp4FQ=; b=Xw0M++i4vWqtOIevKVBICbemg0nbPzXchGzKtGPxGVKJVp6R9davBGy/7p3+mjSNiE6M6Q RLvc+JKzrITcDcU9adySQ1MopJZlhBDOpbXMP25C1R0XgrZmBA9o7YtFAxZRX7JFhQtKIq B5Y7+OT2bOp2oh8iEUbB7sUkVQFNECc= X-MC-Unique: GirlsiMBOcWwxDeJyvsIgw-1 X-Mimecast-MFC-AGG-ID: GirlsiMBOcWwxDeJyvsIgw_1766964883 To: devel@lists.libvirt.org Subject: [PATCH 23/36] qemu_firmware: Set templateFormat for custom paths Date: Mon, 29 Dec 2025 00:33:59 +0100 Message-ID: <20251228233412.1709869-24-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: Kit6eIrKAmFvQneycAPR7a8VbQnyB-gdD91Zt5YnHGY_1766964883 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VXATIWRVTHWUV6IDFLZBIE6W6SQN4JR6 X-Message-ID-Hash: VXATIWRVTHWUV6IDFLZBIE6W6SQN4JR6 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: 1766967222968158500 Content-Type: text/plain; charset="utf-8"; x-default="true" If an NVRAM template is used, its format should be set too. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 5 +++++ ...ware-manual-efi-loader-path-nonstandard.x86_64-latest.xml | 2 +- ...e-manual-efi-nvram-template-nonstandard.x86_64-latest.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 9b6c14701f..2b16d66818 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1623,6 +1623,11 @@ qemuFirmwareFillDomainCustom(virDomainDef *def) if (!loader->format) loader->format =3D VIR_STORAGE_FILE_RAW; =20 + if (loader->nvramTemplate && + !loader->nvramTemplateFormat) { + loader->nvramTemplateFormat =3D loader->format; + } + return; } =20 diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-pa= th-nonstandard.x86_64-latest.xml index c17834b5e6..7baf6ebd40 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.xml @@ -7,7 +7,7 @@ hvm /path/to/OVMF_= CODE.fd - /var/lib/libv= irt/qemu/nvram/guest_VARS.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 cbadd0f0c8..beb146d35a 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/libv= irt/qemu/nvram/guest_VARS.fd + /var/lib/libvirt/qemu/nvram/guest_VARS.fd --=20 2.52.0