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=1771417636; cv=none; d=zohomail.com; s=zohoarc; b=HEGBlAsbisZnrqr2JeQoiY+AIYrRRYr9omq70GFgpRwD1z5+FcTF14LFtprqSx20/kc4fdY/8L2eR0WLBixhLfACaNoT/ILxeOTudUyFvjbIaD6p4MHbiLN7nRnVgH2CHBEeJaSdxUGUY9I+vtp/mTQnLyBim+BewZOkcS5l9Yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771417636; 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=FVTFF1gn0A1muG1y8YujHN3///q1SvO6Cms+7EXflQQ=; b=fFoFO3+p/6lsEFDHwHWHjw3BrcplCShl3PJLflPzkJ5iCIi2WbXKIP/gT6uXfNQl3XbeRI8RSzjUBTHJxdg2fa9sC+Cq4s5y7E7GxFaCmbafrPkfyXfvM5mdPH3O9Dnyb7o8m1bs36mR1ltHqzPqXP1g0xc65raA4x0sM9EOXbk= 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 1771417636472233.24039265628005; Wed, 18 Feb 2026 04:27:16 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9F5CF419D7; Wed, 18 Feb 2026 07:27:15 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 9ABEC43F1F; Wed, 18 Feb 2026 07:10:35 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1CA2941BC0; Wed, 18 Feb 2026 07:10:29 -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 1F5D341BD3 for ; Wed, 18 Feb 2026 07:06:39 -0500 (EST) Received: from mx-prod-mc-03.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-389-AqIe8x0SMMGJ9hwvB05hLw-1; Wed, 18 Feb 2026 07:06:37 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D5E001956058 for ; Wed, 18 Feb 2026 12:06:36 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.45.226.171]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D2F9330001A5 for ; Wed, 18 Feb 2026 12:06:35 +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=-4.7 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=1771416398; 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=FVTFF1gn0A1muG1y8YujHN3///q1SvO6Cms+7EXflQQ=; b=BkgR1fx+dMCHg5XkHVHnqe1au+31d1jCwiuJ14LGSkvXaBe9KGcU9MsGxVKKmWEAZqUF65 no05geyfJEjCGQ84df0L+LmLo99vP1Mka5fGTfAGPB4G9wxp/wYTlI1uXD1ZQxXkxIB0Yx oNLcv9X86WDYfqn0bYTuOJC+/5lgoQs= X-MC-Unique: AqIe8x0SMMGJ9hwvB05hLw-1 X-Mimecast-MFC-AGG-ID: AqIe8x0SMMGJ9hwvB05hLw_1771416396 To: devel@lists.libvirt.org Subject: [PATCH v3 19/38] qemu_firmware: Support extended syntax for ROM firmware descriptors Date: Wed, 18 Feb 2026 13:05:42 +0100 Message-ID: <20260218120601.230343-20-abologna@redhat.com> In-Reply-To: <20260218120601.230343-1-abologna@redhat.com> References: <20260218120601.230343-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: J9RLoDSdeta4epl8smwMiVJOcBmYT32lZ07TfndKTuU_1771416396 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3ZAMN3PW2K7ZIC4A7JU5HC6CRSKLOZCK X-Message-ID-Hash: 3ZAMN3PW2K7ZIC4A7JU5HC6CRSKLOZCK 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: 1771417638839158500 Content-Type: text/plain; charset="utf-8"; x-default="true" 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: 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 4b2155f311..f64ea287b4 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