[libvirt PATCH 21/33] qemu: Move qemuDomainNVRAMPathFormat() to qemu_firmware

Andrea Bolognani abologna at redhat.com
Wed Feb 15 10:42:18 UTC 2023


There are no other callers remaining.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 src/qemu/qemu_domain.c   | 9 ---------
 src/qemu/qemu_domain.h   | 5 -----
 src/qemu/qemu_firmware.c | 9 +++++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fad46fec1b..f0b9e08d85 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11353,15 +11353,6 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDef *disk)
 }
 
 
-void
-qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
-                          virDomainDef *def,
-                          char **path)
-{
-    *path = g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name);
-}
-
-
 virDomainEventSuspendedDetailType
 qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason)
 {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 1053d1d4cb..987398486a 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1049,11 +1049,6 @@ qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason);
 bool
 qemuDomainDiskIsMissingLocalOptional(virDomainDiskDef *disk);
 
-void
-qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
-                          virDomainDef *def,
-                          char **path);
-
 virDomainEventSuspendedDetailType
 qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason);
 
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 4a6adedfcb..cf854dfe19 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -979,6 +979,15 @@ qemuFirmwareOSInterfaceTypeFromOsDefLoaderType(virDomainLoader type)
 }
 
 
+static void
+qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
+                          virDomainDef *def,
+                          char **path)
+{
+    *path = g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name);
+}
+
+
 #define VIR_QEMU_FIRMWARE_AMD_SEV_ES_POLICY (1 << 2)
 
 
-- 
2.39.1



More information about the libvir-list mailing list