[libvirt PATCH 06/10] qemu: inline code for filling in per-VM NVRAM path
Before creating a NVRAM path, the qemuDomainNVRAMPathGenerate
method checks whether the config is using the old style
firmware approach. This check is redundant in one of the two
callers. By inlining the check into the other caller, it makes
it clearer to understand that the NVRAM path filling is done
conditionally.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_domain.c | 14 +++-----------
src/qemu/qemu_domain.h | 4 ----
src/qemu/qemu_firmware.c | 7 ++++---
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4e9c845f68..3c3dfe5984 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4402,7 +4402,9 @@ qemuDomainDefPostParse(virDomainDef *def,
def->os.machine = g_strdup(machine);
}
- qemuDomainNVRAMPathGenerate(cfg, def);
+ if (virDomainDefHasOldStyleROUEFI(def) &&
+ !def->os.loader->nvram)
+ qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0)
return -1;
@@ -10963,16 +10965,6 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
}
-void
-qemuDomainNVRAMPathGenerate(virQEMUDriverConfig *cfg,
- virDomainDef *def)
-{
- if (virDomainDefHasOldStyleROUEFI(def) &&
- !def->os.loader->nvram)
- qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
-}
-
-
virDomainEventSuspendedDetailType
qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason)
{
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 3ca6ef084e..d2cb5775e8 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -983,10 +983,6 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
virDomainDef *def,
char **path);
-void
-qemuDomainNVRAMPathGenerate(virQEMUDriverConfig *cfg,
- virDomainDef *def);
-
virDomainEventSuspendedDetailType
qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason);
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 84c80eaacb..a7373e3026 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1139,11 +1139,12 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
VIR_FREE(def->os.loader->templt);
def->os.loader->templt = g_strdup(flash->nvram_template.filename);
- qemuDomainNVRAMPathGenerate(cfg, def);
+ qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
- VIR_DEBUG("decided on firmware '%s' varstore template
'%s'",
+ VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM
'%s'",
def->os.loader->path,
- def->os.loader->templt);
+ def->os.loader->templt,
+ def->os.loader->nvram);
break;
case QEMU_FIRMWARE_DEVICE_KERNEL:
--
2.34.1