From nobody Fri Jan 9 08:49:52 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=1766970469; cv=none; d=zohomail.com; s=zohoarc; b=Q1Nn8IMxOh7MqiZtbNICLoiY5NgBD9MYaqofHwNmH50FJbFdzuxYJ2sAZGfyMjB5KwLRD80EeJ+C37vugLGyFiORb7327ENZQcrj+TY9SmLpRypfRxZnNnyEUOdM1x9rVlbIgE7Ugim0JX620q/CLcEjcokp6ovJts7LrI12Pyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766970469; 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=gilRLcgZq/xwEd8NNaoRqfw95CGD2UokH2GhdqSacog=; b=McPPAFvRsdP80V1hDTjL0dXdaNTmZZkMDsCEshSi7W7zrof5D7POY6UJ56nTPZuinOdRGAg9Wnr3z4MSqq1L/dUO/vF22xerYq3vwevktGciRt0FhQH0kOtx2XV3NtZq/ez5SQPhP/MYm/5t/6YwTs13Oho8YctPgTYDqBjgxMo= 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 1766970469270802.091158895143; Sun, 28 Dec 2025 17:07:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 264763F95F; Sun, 28 Dec 2025 20:07:18 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 47E7741A20; Sun, 28 Dec 2025 20:02:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 977E3418CA; Sun, 28 Dec 2025 18:49:50 -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 F222A4192F for ; Sun, 28 Dec 2025 18:41:21 -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-387-JgHXAWVAPByQtpitTInqxQ-1; Sun, 28 Dec 2025 18:41:20 -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 5B5671955F34 for ; Sun, 28 Dec 2025 23:41:19 +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 6B5431800663 for ; Sun, 28 Dec 2025 23:41:18 +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=1766965281; 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=gilRLcgZq/xwEd8NNaoRqfw95CGD2UokH2GhdqSacog=; b=SHbygbBdoPGpEQ+MxrClkihA0FiIPW1i5ISInpEWJGWH8DGLitWZpRRXCbPuA/PMOVM7zJ NgxiQ0odiw0SKeJFheXZv/NkfAztjVDZEVWSyioZ8YbPxi4oRnySw0jhv2fkt/W3xreKbT Z6ZKQgqucvcxhrI8UxB4nCcFH2pF3lA= X-MC-Unique: JgHXAWVAPByQtpitTInqxQ-1 X-Mimecast-MFC-AGG-ID: JgHXAWVAPByQtpitTInqxQ_1766965279 To: devel@lists.libvirt.org Subject: [PATCH 23/29] qemu_firmware: Generate correct name for JSON format NVRAM Date: Mon, 29 Dec 2025 00:40:42 +0100 Message-ID: <20251228234048.1711701-24-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: seRmeJ1ZPWw8WQVTB_7y3HVniSOG9CDhz4FXZKamx40_1766965279 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: D3HET7IE5SWE32QUPASWCDGHU3F5PSFW X-Message-ID-Hash: D3HET7IE5SWE32QUPASWCDGHU3F5PSFW 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: 1766970470215158500 Content-Type: text/plain; charset="utf-8"; x-default="true" The file extension needs to match the format. In the case of JSON, we're ditching the _VARS part of the filename too. Having that in there made a lot of sense in the beginning, when OVMF_CODE.fd and OVMF_VARS.fd were used for the executable and NVRAM template respectively, and a similar pattern was used for AAVMF (aka edk2 on aarch64) as well. These days, the aarch64 build of edk2 has ditched the pattern, so the only remaining holdout is the x86_64 build; the uefi-vars build doesn't use _CODE and _VARS on any architecture. It's a good time to get rid of this vestigial part of the filename. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 962d6cdee7..0504eef727 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1073,7 +1073,7 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def, g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainLoaderDef *loader =3D def->os.loader; virStorageFileFormat nvramFormat =3D VIR_STORAGE_FILE_NONE; - const char *ext =3D NULL; + const char *suffix =3D NULL; =20 if (!loader) return; @@ -1134,16 +1134,18 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def, if (abiUpdate && loader->nvramTemplate && virStringHasSuffix(loader->nvramTemplate, ".raw")) - ext =3D ".raw"; + suffix =3D "_VARS.raw"; else - ext =3D ".fd"; + suffix =3D "_VARS.fd"; } if (loader->nvram->format =3D=3D VIR_STORAGE_FILE_QCOW2) - ext =3D ".qcow2"; + suffix =3D "_VARS.qcow2"; + if (loader->nvram->format =3D=3D VIR_STORAGE_FILE_JSON) + suffix =3D ".json"; =20 - loader->nvram->path =3D g_strdup_printf("%s/%s_VARS%s", + loader->nvram->path =3D g_strdup_printf("%s/%s%s", cfg->nvramDir, def->name, - NULLSTR_EMPTY(ext)); + NULLSTR_EMPTY(suffix)); } =20 =20 --=20 2.52.0