119 lines
4.3 KiB
Diff
119 lines
4.3 KiB
Diff
From ab8dbe11d56790f6fd140919559ad7610cc1f535 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <ab8dbe11d56790f6fd140919559ad7610cc1f535.1772815314.git.jdenemar@redhat.com>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Fri, 23 Jan 2026 19:47:13 +0100
|
|
Subject: [PATCH] qemu: Create and delete varstore file
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Simply mimicking what is currently done for NVRAM files does
|
|
the trick. A few user-visible messages are updated to reflect
|
|
the fact that they apply both to NVRAM and varstore.
|
|
|
|
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 5dc97de2c4fb4c2097c29cbe0eb38e3cdb4e92b0)
|
|
|
|
https://issues.redhat.com/browse/RHEL-82645
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
src/qemu/qemu_driver.c | 14 +++++++++-----
|
|
src/qemu/qemu_process.c | 28 ++++++++++++++++++++++++++--
|
|
2 files changed, 35 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index d314aa94ce..ad894c7584 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -6639,22 +6639,26 @@ qemuDomainUndefineFlags(virDomainPtr dom,
|
|
}
|
|
}
|
|
|
|
- if (vm->def->os.loader && vm->def->os.loader->nvram &&
|
|
- virStorageSourceIsLocalStorage(vm->def->os.loader->nvram)) {
|
|
- nvram_path = g_strdup(vm->def->os.loader->nvram->path);
|
|
+ if (vm->def->os.loader) {
|
|
+ if (vm->def->os.loader->nvram &&
|
|
+ virStorageSourceIsLocalStorage(vm->def->os.loader->nvram)) {
|
|
+ nvram_path = g_strdup(vm->def->os.loader->nvram->path);
|
|
+ } else if (vm->def->os.varstore && vm->def->os.varstore->path) {
|
|
+ nvram_path = g_strdup(vm->def->os.varstore->path);
|
|
+ }
|
|
}
|
|
|
|
if (nvram_path && virFileExists(nvram_path)) {
|
|
if ((flags & VIR_DOMAIN_UNDEFINE_NVRAM)) {
|
|
if (unlink(nvram_path) < 0) {
|
|
virReportSystemError(errno,
|
|
- _("failed to remove nvram: %1$s"),
|
|
+ _("Failed to remove NVRAM/varstore: %1$s"),
|
|
nvram_path);
|
|
goto endjob;
|
|
}
|
|
} else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) {
|
|
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
|
|
- _("cannot undefine domain with nvram"));
|
|
+ _("Cannot undefine domain with NVRAM/varstore"));
|
|
goto endjob;
|
|
}
|
|
}
|
|
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
index 47deb9abb9..3ca87df284 100644
|
|
--- a/src/qemu/qemu_process.c
|
|
+++ b/src/qemu/qemu_process.c
|
|
@@ -5031,6 +5031,27 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
|
|
}
|
|
|
|
|
|
+static int
|
|
+qemuPrepareVarstore(virQEMUDriver *driver,
|
|
+ virDomainDef *def,
|
|
+ bool reset_nvram)
|
|
+{
|
|
+ virDomainLoaderDef *loader = def->os.loader;
|
|
+ virDomainVarstoreDef *varstore = def->os.varstore;
|
|
+
|
|
+ if (!loader || !varstore)
|
|
+ return 0;
|
|
+
|
|
+ VIR_DEBUG("varstore='%s'", NULLSTR(varstore->path));
|
|
+
|
|
+ if (qemuPrepareNVRAMFileCommon(driver, varstore->path,
|
|
+ varstore->template, reset_nvram) < 0)
|
|
+ return -1;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
static void
|
|
qemuLogOperation(virDomainObj *vm,
|
|
const char *msg,
|
|
@@ -7795,6 +7816,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
|
|
unsigned int hostdev_flags = 0;
|
|
qemuDomainObjPrivate *priv = vm->privateData;
|
|
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
|
+ bool reset_nvram = !!(flags & VIR_QEMU_PROCESS_START_RESET_NVRAM);
|
|
|
|
/*
|
|
* Create all per-domain directories in order to make sure domain
|
|
@@ -7804,8 +7826,10 @@ qemuProcessPrepareHost(virQEMUDriver *driver,
|
|
qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0)
|
|
return -1;
|
|
|
|
- if (qemuPrepareNVRAM(driver, vm->def,
|
|
- !!(flags & VIR_QEMU_PROCESS_START_RESET_NVRAM)) < 0)
|
|
+ if (qemuPrepareNVRAM(driver, vm->def, reset_nvram) < 0)
|
|
+ return -1;
|
|
+
|
|
+ if (qemuPrepareVarstore(driver, vm->def, reset_nvram) < 0)
|
|
return -1;
|
|
|
|
if (vm->def->vsock) {
|
|
--
|
|
2.53.0
|