From nobody Tue Mar 3 04:54:10 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=1771417836; cv=none; d=zohomail.com; s=zohoarc; b=SqNtwBH0/Jxp1mNlvNluIPWA2GoNmu2jOHwLPEorjxCZq6Ef3urDzPFEQUOzHwLeQiqllvqp1ca75/kiD/9ysKBLjJ6KkgPsC6y32/wETY5BLwjYfdyGsA41Za5qOK9sA7tcpVCuDAiU7QwIg00KLx/8ymEHhOnhIcVKgyu5crc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771417836; 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=IDlQo7W79Qo/etXhi1a/giX/JgWgaoN4boY9VlJcXM0=; b=JaUwFoP12RgtuKLEDtprZw7QvBr2+Aw6irj/Mzb3Iqqoq51m0LbEKjlL8XgYbF8xcXCl5A0HHSMkuYQNIZG+sq7UYMu0Tib6IpA3Ccgi15zTty+NFUl7Wi61TIA+7Fd3ZBrlzFk7wBA+S43++ITSAuMPUtSt9rHssHd3bQv5C+8= 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 1771417836286266.88965567874436; Wed, 18 Feb 2026 04:30:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A0B2A41DB2; Wed, 18 Feb 2026 07:30:35 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6B54544087; Wed, 18 Feb 2026 07:10:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1368B41B7F; Wed, 18 Feb 2026 07:10:30 -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 7B46E41B80 for ; Wed, 18 Feb 2026 07:06:54 -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-255-M_T9WfKOMdGJcHtdSUXIxg-1; Wed, 18 Feb 2026 07:06:52 -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 3A03119560B2 for ; Wed, 18 Feb 2026 12:06:52 +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 5365C30001A5 for ; Wed, 18 Feb 2026 12:06:51 +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=1771416414; 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=IDlQo7W79Qo/etXhi1a/giX/JgWgaoN4boY9VlJcXM0=; b=AyPBGEEsPl++mxStyFpEHAZnm/XJRrQUHa6+h9FCUWMxmN9ytuxpV5nBVqgj274Ho2XUfR 8oyVl/icTBzFjvqznlS3lagKWDxbjwrPncQUmbtTPUgj9DteETNQSQE+cltjeWFynIaoHw +JSU3LvEgunQreF3OXBLBcVykZlZOVU= X-MC-Unique: M_T9WfKOMdGJcHtdSUXIxg-1 X-Mimecast-MFC-AGG-ID: M_T9WfKOMdGJcHtdSUXIxg_1771416412 To: devel@lists.libvirt.org Subject: [PATCH v3 28/38] qemu_firmware: Generate varstore path when necessary Date: Wed, 18 Feb 2026 13:05:51 +0100 Message-ID: <20260218120601.230343-29-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: TEpXOXyDneTG1nWXfsP4OXqp2SvyW6poMREYUKccoLQ_1771416412 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HTCT3REC5HTQIN4EC6KV2GD7SHIEWQOZ X-Message-ID-Hash: HTCT3REC5HTQIN4EC6KV2GD7SHIEWQOZ 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: 1771417838202154100 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduce qemuFirmwareEnsureVarstore(), which performs the same task as the existing qemuFirmwareEnsureNVRAM() but for the varstore element. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_firmware.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 24f12c0cf1..3b48ba575e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1069,6 +1069,38 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def, } =20 =20 +/** + * qemuFirmwareEnsureVarstore: + * @def: domain definition + * @driver: QEMU driver + * + * Make sure that information for the varstore is present. This might + * involve automatically generating the corresponding path. + */ +static void +qemuFirmwareEnsureVarstore(virDomainDef *def, + virQEMUDriver *driver) +{ + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + virDomainLoaderDef *loader =3D def->os.loader; + virDomainVarstoreDef *varstore =3D def->os.varstore; + + if (!loader) + return; + + if (loader->type !=3D VIR_DOMAIN_LOADER_TYPE_ROM) + return; + + if (!varstore) + return; + + if (varstore->path) + return; + + varstore->path =3D g_strdup_printf("%s/%s.json", + cfg->varstoreDir, def->name); +} + =20 /** * qemuFirmwareSetOsFeatures: @@ -2064,10 +2096,11 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, } } =20 - /* Always ensure that the NVRAM path is present, even if we - * haven't found a match: the configuration might simply be - * referring to a custom firmware build */ + /* Always ensure that the NVRAM/varstore is configured where + * appropriate, even if we haven't found a match: the configuration + * might simply be referring to a custom firmware build */ qemuFirmwareEnsureNVRAM(def, driver, abiUpdate); + qemuFirmwareEnsureVarstore(def, driver); =20 return 0; } --=20 2.53.0