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=1771417756; cv=none; d=zohomail.com; s=zohoarc; b=CdnV77T7WDpgcSTN4zpd12sJfr5IwxK97u8LpPywL5ycHa06TjXumyrkCmF7YeJ9osMYb3+E6wlDIFSAcazVIv6jZ/UPZChwmARyDyUq0y1ssm/iRS3ull+5vXib00dpXjoLXYn/oU6YWkOH2BkvvyAwtXMI7/4vEz/Z4A7xX+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771417756; 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=rHrMPDqpeg9bAhQmnYI3Dr2REbd/ZnQEKw3FptuxRKo=; b=OY5cbXYboydnR8GsekBiMXIQgruINu0E0fv97YRashf/2OhOsNtabfRxH34mzc9LCfXireTeuMGT4ARrwCs44h5e/FLEjioR8O5mtlYhsWhDJiW+lJwh4msTEt8VjNzM5z8NTlKkYyLrBn2hgyRiC6QAmblZJ52rWRFKG+NtZcA= 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 1771417756981855.8276571716654; Wed, 18 Feb 2026 04:29:16 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id F3F2241CD0; Wed, 18 Feb 2026 07:29:15 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 55D9943FF6; Wed, 18 Feb 2026 07:10:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8630141BCC; 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.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 62CD14193F for ; Wed, 18 Feb 2026 07:06:51 -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-568-JoS9_iCkO1KaGja5rd7gCQ-1; Wed, 18 Feb 2026 07:06:49 -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 1A04F19560B5 for ; Wed, 18 Feb 2026 12:06:49 +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 0CC2E30001B9 for ; Wed, 18 Feb 2026 12:06:47 +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=1771416411; 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=rHrMPDqpeg9bAhQmnYI3Dr2REbd/ZnQEKw3FptuxRKo=; b=aUAAaKgyMT8GVbCi5/UjgwNGGroOR2iEXRnRrnBZ5JPf/LqZo/1ejziYyHWeO3LutNJB/L bsE8+ILRtLhjYvm3jqEsfJNKWLWePsZYP/B00/RA5zPYxJrBcLEx2cs4tfYGTihcCIoSP9 gpBGw6Cz0ZFGAqLcrK2cXFjeW3A6hWQ= X-MC-Unique: JoS9_iCkO1KaGja5rd7gCQ-1 X-Mimecast-MFC-AGG-ID: JoS9_iCkO1KaGja5rd7gCQ_1771416409 To: devel@lists.libvirt.org Subject: [PATCH v3 26/38] qemu_firmware: Fill in varstore information Date: Wed, 18 Feb 2026 13:05:49 +0100 Message-ID: <20260218120601.230343-27-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: yacbTZdxB7aJsNmWLPxIKmb4JDww7hdPY--UL2-Gtec_1771416409 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3VHPV5ZEUQXUUG7KZFRTRB67VTYZER5X X-Message-ID-Hash: 3VHPV5ZEUQXUUG7KZFRTRB67VTYZER5X 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: 1771417757413158500 Content-Type: text/plain; charset="utf-8"; x-default="true" If the matching firmware requires the use of varstore, we have to bubble up information about it, namely the path to the template. If the struct member doesn't exist yet, we need to allocate it. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 094dd023f9..24f12c0cf1 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1493,6 +1493,7 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; const qemuFirmwareMappingMemory *memory =3D &fw->mapping.data.memory; virDomainLoaderDef *loader =3D NULL; + virDomainVarstoreDef *varstore =3D NULL; virStorageFileFormat format; bool hasSecureBoot =3D false; bool hasEnrolledKeys =3D false; @@ -1553,8 +1554,17 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def, VIR_FREE(loader->path); loader->path =3D g_strdup(memory->filename); =20 - VIR_DEBUG("decided on loader '%s'", - loader->path); + if (memory->template) { + if (!def->os.varstore) + def->os.varstore =3D virDomainVarstoreDefNew(); + varstore =3D def->os.varstore; + + VIR_FREE(varstore->template); + varstore->template =3D g_strdup(memory->template); + } + + VIR_DEBUG("decided on loader '%s' template '%s'", + loader->path, NULLSTR(varstore ? varstore->template : NU= LL)); break; =20 case QEMU_FIRMWARE_DEVICE_NONE: --=20 2.53.0