From nobody Tue Mar 3 04:55: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; 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=1771872951; cv=none; d=zohomail.com; s=zohoarc; b=dumNK2IUmhijmtm2ZHI/0HFqpsxaH2G8nns3MPfVgh0Tgy2QixdroH+JwDHvAUhVv7LOzNulcP61ngJfA0wa9XoyZYb44+81FKRGxMZbQh0Mng/LNQo53cNgjV7fWoZbhGMUJPh/8uYF5z1Ck5Ge+9bpI+aq7U5d6AUP+XDVnRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771872951; 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=DNGRxvU/30pYG/EaSY8RjjK/O3Gnja3bue56AYIRLY0=; b=fNJDkb/xDzLBQWaZgxJunb5iwKewRRKP1TBHgWQwEmI/dS1aCxdHSaLRwD0edgkUhsomszwknF6R+6Ay2SHektGYDKBRscP0U/PwtvHNC9AQzvhHwgeTlop2cBTn83LC/GuauM+BNVqUWN90lM+sw9zWcc/yrG8HMmWgQskU+D4= 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 1771872951374165.36432547325956; Mon, 23 Feb 2026 10:55:51 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9675E419A0; Mon, 23 Feb 2026 13:55:50 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 534C14415E; Mon, 23 Feb 2026 13:36:44 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6095B41A0A; Mon, 23 Feb 2026 13:36:23 -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 EB00C41A8D for ; Mon, 23 Feb 2026 13:32:17 -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-500-rfayWCpyP626swPP5Segxw-1; Mon, 23 Feb 2026 13:32:16 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D03E1954B17 for ; Mon, 23 Feb 2026 18:32:14 +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 304D0195419A for ; Mon, 23 Feb 2026 18:32:12 +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=1771871537; 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=DNGRxvU/30pYG/EaSY8RjjK/O3Gnja3bue56AYIRLY0=; b=SnKtNbfGTuNn27D9JTbUPI7j20aw6v7d313Rh69RdTo/Egs/f/ufHWlW4rA2yMdBukuTOD oYl332367CbuP1XUxztjpyHjENY6jovb+Nkc/lSgwWvzMExd2fGwAAyRefjESTwqTFt4yO zuJdMvavJhIhby3AiH8dlF2tfs71GtE= X-MC-Unique: rfayWCpyP626swPP5Segxw-1 X-Mimecast-MFC-AGG-ID: rfayWCpyP626swPP5Segxw_1771871535 To: devel@lists.libvirt.org Subject: [PATCH v4 27/36] qemu_firmware: Generate varstore path when necessary Date: Mon, 23 Feb 2026 19:31:10 +0100 Message-ID: <20260223183119.501349-28-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: cQAmfGcS3kJfAgHQfZqEmLQ-iW5yu-flejIM-EanYfI_1771871535 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LIINELLAD26PKUA4MMF4HB2O3XF2D25E X-Message-ID-Hash: LIINELLAD26PKUA4MMF4HB2O3XF2D25E 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: 1771872952502158500 Introduce qemuFirmwareEnsureVarstore(), which performs the same task as the existing qemuFirmwareEnsureNVRAM() but for the varstore element. 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 | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 5a07e3181f..d8633c6b28 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: @@ -2063,10 +2095,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