From nobody Tue Mar 3 04:54:28 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; 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=1771872699; cv=none; d=zohomail.com; s=zohoarc; b=VEMTE8VDNQCzoTjJZ6dVk5O5bZoWyzyLhDzzADUOLvICgouqE+ISduSaqXVxiwdU3nD6t05TrSGb35PAcyR7GHKa6G+UE32MNnAc/jynXIaypFswNyk66HZtqMSGkpDINhVtl5vdG1HNc+glFrf9ev3tHkNZnBWkiXD6fOxdCtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771872699; 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=bunRlRfTIYp+Kir8BIMYyX62C1hKIhhbu/KoZiGkBwc=; b=YQXlNVenw1qqmXwSilc8frXpfyqkLvDtF8P3RV3BxNMw86YozwyzYj9HUd8H+Sq9dMTHYyUwet1wQr1Rrn4J8C5Bu3Cwx+h2FD6NScaHL9SpaF3zKyG036prKRQiXPUk8Y8flfmOzBJA2seL4SFlVHPACNH0K9IQC5VDppQfNiI= 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 177187269890994.29844238295243; Mon, 23 Feb 2026 10:51:38 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2AFB1419EA; Mon, 23 Feb 2026 13:51:38 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id E3C2F43FB1; Mon, 23 Feb 2026 13:36:28 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B942541C42; Mon, 23 Feb 2026 13:36:21 -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 78490419EF for ; Mon, 23 Feb 2026 13:32:13 -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-144-TTnWoSeON-64vdGQ80arzQ-1; Mon, 23 Feb 2026 13:32:11 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 30BA21830199 for ; Mon, 23 Feb 2026 18:32:00 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.44.32.20]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 20B981955D71 for ; Mon, 23 Feb 2026 18:31:58 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,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=1771871533; 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=bunRlRfTIYp+Kir8BIMYyX62C1hKIhhbu/KoZiGkBwc=; b=YVqxocoR0JapDI9NTlR9jM45rrZhLPpS6PMA5ImsMVhQwDjjipXHOg5cn3G8ceCLHFP8lT SM1gUJzQ++pXXsubLQ0J+sCKKlGKS/XzmsJ3ieCun7hTSpZUgtJqe6vmUDbUe+l80e7WH1 OmXOBbmstU9Ww8TmB92cLdcIkdeVIVo= X-MC-Unique: TTnWoSeON-64vdGQ80arzQ-1 X-Mimecast-MFC-AGG-ID: TTnWoSeON-64vdGQ80arzQ_1771871531 To: devel@lists.libvirt.org Subject: [PATCH v4 19/36] qemu_firmware: Support extended syntax for ROM firmware descriptors Date: Mon, 23 Feb 2026 19:31:02 +0100 Message-ID: <20260223183119.501349-20-abologna@redhat.com> In-Reply-To: <20260223183119.501349-1-abologna@redhat.com> References: <20260223183119.501349-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HJCorqY9FeKflbmLNWfYjYE8hHt5bbHvvt_fRFhuFCo_1771871531 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JNOF4H23M4WJQXVN5SJSNKH2PCOIAZMR X-Message-ID-Hash: JNOF4H23M4WJQXVN5SJSNKH2PCOIAZMR 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: 1771872701349158500 The existing syntax can only describe stateless firmware builds, while the extended one can additionally describe builds intended for use with the uefi-vars device. This involves including the path to the corresponding varstore template. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik Acked-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index f9cb9058ac..7af3f32b85 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -95,6 +95,7 @@ struct _qemuFirmwareMappingFlash { typedef struct _qemuFirmwareMappingMemory qemuFirmwareMappingMemory; struct _qemuFirmwareMappingMemory { char *filename; + char *template; }; =20 =20 @@ -219,6 +220,7 @@ static void qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory *memory) { g_free(memory->filename); + g_free(memory->template); } =20 =20 @@ -406,7 +408,11 @@ qemuFirmwareMappingMemoryParse(const char *path, virJSONValue *doc, qemuFirmwareMappingMemory *memory) { + virJSONValue *uefi_vars; const char *filename; + const char *template; + + uefi_vars =3D virJSONValueObjectGet(doc, "uefi-vars"); =20 if (!(filename =3D virJSONValueObjectGetString(doc, "filename"))) { VIR_DEBUG("missing 'filename' in '%s'", path); @@ -415,6 +421,15 @@ qemuFirmwareMappingMemoryParse(const char *path, =20 memory->filename =3D g_strdup(filename); =20 + if (uefi_vars) { + if (!(template =3D virJSONValueObjectGetString(uefi_vars, "templat= e"))) { + VIR_DEBUG("missing 'template' for 'uefi-vars' in '%s'", path); + return -1; + } + + memory->template =3D g_strdup(template); + } + return 0; } =20 @@ -702,6 +717,20 @@ qemuFirmwareMappingMemoryFormat(virJSONValue *mapping, memory->filename) < 0) return -1; =20 + if (memory->template) { + g_autoptr(virJSONValue) uefi_vars =3D virJSONValueNewObject(); + + if (virJSONValueObjectAppendString(uefi_vars, + "template", + memory->template) < 0) + return -1; + + if (virJSONValueObjectAppend(mapping, + "uefi-vars", + &uefi_vars) < 0) + return -1; + } + return 0; } =20 --=20 2.53.0