87 lines
2.7 KiB
Diff
87 lines
2.7 KiB
Diff
From 5f0e8ea3a876e5bd88f1312cc5ffd90469c1e190 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <5f0e8ea3a876e5bd88f1312cc5ffd90469c1e190.1772815314.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Wed, 21 Jan 2026 18:25:37 +0100
|
|
Subject: [PATCH] qemu_firmware: Generate varstore path when necessary
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Introduce qemuFirmwareEnsureVarstore(), which performs the same
|
|
task as the existing qemuFirmwareEnsureNVRAM() but for the
|
|
varstore element.
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit 0dd118cceee833ff905e6c24785a2acda8ccc80b)
|
|
|
|
https://issues.redhat.com/browse/RHEL-82645
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
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,
|
|
}
|
|
|
|
|
|
+/**
|
|
+ * 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 = virQEMUDriverGetConfig(driver);
|
|
+ virDomainLoaderDef *loader = def->os.loader;
|
|
+ virDomainVarstoreDef *varstore = def->os.varstore;
|
|
+
|
|
+ if (!loader)
|
|
+ return;
|
|
+
|
|
+ if (loader->type != VIR_DOMAIN_LOADER_TYPE_ROM)
|
|
+ return;
|
|
+
|
|
+ if (!varstore)
|
|
+ return;
|
|
+
|
|
+ if (varstore->path)
|
|
+ return;
|
|
+
|
|
+ varstore->path = g_strdup_printf("%s/%s.json",
|
|
+ cfg->varstoreDir, def->name);
|
|
+}
|
|
+
|
|
|
|
/**
|
|
* qemuFirmwareSetOsFeatures:
|
|
@@ -2063,10 +2095,11 @@ qemuFirmwareFillDomain(virQEMUDriver *driver,
|
|
}
|
|
}
|
|
|
|
- /* 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);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.53.0
|