From d4383682c4928ce612d2e092c12fa083579005b9 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 27 Jan 2023 15:49:36 +0100 Subject: [PATCH] qemu: Move qemuDomainNVRAMPathFormat() to qemu_firmware There are no other callers remaining. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- 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 f4ed5ffaeb..bab3397f9e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11356,15 +11356,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 54c2e02557..550397ee50 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1043,11 +1043,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)