From: Peter Krempa <pkre...@redhat.com>
Refactor the function and all callees to use the driver config instead.
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_extdevice.c | 18 ++++++++++--------
src/qemu/qemu_extdevice.h | 4 ++--
src/qemu/qemu_process.c | 2 +-
src/qemu/qemu_tpm.c | 14 +++++---------
src/qemu/qemu_tpm.h | 4 ++--
6 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5603feaa05..235bfd65cb 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5816,7 +5816,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
if (rmdir(chkDir) < 0 && errno != ENOENT)
VIR_WARN("unable to remove checkpoint directory %s", chkDir);
}
- qemuExtDevicesCleanupHost(driver, vm->def, flags, migration);
+ qemuExtDevicesCleanupHost(cfg, vm->def, flags, migration);
}
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 31c7a14156..8df93a77ce 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -58,7 +58,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver,
/*
* qemuExtDevicesInitPaths:
*
- * @driver: QEMU driver
+ * @cfg: QEMU driver config
* @def: domain definition
*
* Initialize paths of external devices so that it is known where state is
@@ -66,7 +66,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver,
* changes.
*/
int
-qemuExtDevicesInitPaths(virQEMUDriver *driver,
+qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg,
virDomainDef *def)
{
size_t i;
@@ -75,7 +75,7 @@ qemuExtDevicesInitPaths(virQEMUDriver *driver,
virDomainTPMDef *tpm = def->tpms[i];
if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
- qemuExtTPMInitPaths(driver, def, tpm) < 0)
+ qemuExtTPMInitPaths(cfg, def, tpm) < 0)
return -1;
}
@@ -95,10 +95,11 @@ int
qemuExtDevicesPrepareDomain(virQEMUDriver *driver,
virDomainObj *vm)
{
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
int ret = 0;
size_t i;
- if (qemuExtDevicesInitPaths(driver, vm->def) < 0)
+ if (qemuExtDevicesInitPaths(cfg, vm->def) < 0)
return -1;
for (i = 0; i < vm->def->nvideos; i++) {
@@ -151,21 +152,21 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
void
-qemuExtDevicesCleanupHost(virQEMUDriver *driver,
+qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg,
virDomainDef *def,
virDomainUndefineFlagsValues flags,
bool migration)
{
size_t i;
- if (qemuExtDevicesInitPaths(driver, def) < 0)
+ if (qemuExtDevicesInitPaths(cfg, def) < 0)
return;
for (i = 0; i < def->ntpms; i++) {
virDomainTPMDef *tpm = def->tpms[i];
if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
- qemuExtTPMCleanupHost(driver, tpm, flags, migration);
+ qemuExtTPMCleanupHost(cfg, tpm, flags, migration);
}
}
@@ -282,10 +283,11 @@ qemuExtDevicesStop(virQEMUDriver *driver,
virDomainObj *vm,
bool migration)
{
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
virDomainDef *def = vm->def;
size_t i;
- if (qemuExtDevicesInitPaths(driver, def) < 0)
+ if (qemuExtDevicesInitPaths(cfg, def) < 0)
return;
for (i = 0; i < def->nvideos; i++) {
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index 36f7fb77a8..a8ed2aa7e4 100644
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -31,7 +31,7 @@ int qemuExtDeviceLogCommand(virQEMUDriver *driver,
G_GNUC_WARN_UNUSED_RESULT;
int
-qemuExtDevicesInitPaths(virQEMUDriver *driver,
+qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg,
virDomainDef *def)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -45,7 +45,7 @@ int qemuExtDevicesPrepareHost(virQEMUDriver *driver,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
G_GNUC_WARN_UNUSED_RESULT;
-void qemuExtDevicesCleanupHost(virQEMUDriver *driver,
+void qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg,
virDomainDef *def,
virDomainUndefineFlagsValues flags,
bool migration)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index bed517184f..5636d4fb76 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -9577,7 +9577,7 @@ qemuProcessReconnect(void *opaque)
if (qemuDomainMasterKeyReadFile(priv) < 0)
goto error;
- if (qemuExtDevicesInitPaths(driver, obj->def) < 0)
+ if (qemuExtDevicesInitPaths(cfg, obj->def) < 0)
goto error;
/* If we are connecting to a guest started by old libvirt there is no
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 0d3be3971a..b2f76e6b8b 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -926,7 +926,7 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm,
/**
* qemuTPMEmulatorCleanupHost:
- * @driver: QEMU driver
+ * @cfg: QEMU driver config
* @tpm: TPM definition
* @flags: flags indicating whether to keep or remove TPM persistent state
* @migration: whether cleanup is due to a successful outgoing or failed
@@ -935,13 +935,11 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm,
* Clean up persistent storage for the swtpm.
*/
static void
-qemuTPMEmulatorCleanupHost(virQEMUDriver *driver,
+qemuTPMEmulatorCleanupHost(virQEMUDriverConfig *cfg,
virDomainTPMDef *tpm,
virDomainUndefineFlagsValues flags,
bool migration)
{
- g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-
/* Never remove the state in case of migration with shared storage. */
if (migration &&
virFileIsSharedFS(tpm->data.emulator.source_path,
cfg->sharedFilesystems) == 1)
@@ -1275,12 +1273,10 @@ qemuTPMCanMigrateSharedStorage(virDomainDef *def)
int
-qemuExtTPMInitPaths(virQEMUDriver *driver,
+qemuExtTPMInitPaths(virQEMUDriverConfig *cfg,
virDomainDef *def,
virDomainTPMDef *tpm)
{
- g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-
return qemuTPMEmulatorInitPaths(tpm,
cfg->swtpmStorageDir,
cfg->swtpmLogDir,
@@ -1311,12 +1307,12 @@ qemuExtTPMPrepareHost(virQEMUDriver *driver,
void
-qemuExtTPMCleanupHost(virQEMUDriver *driver,
+qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg,
virDomainTPMDef *tpm,
virDomainUndefineFlagsValues flags,
bool migration)
{
- qemuTPMEmulatorCleanupHost(driver, tpm, flags, migration);
+ qemuTPMEmulatorCleanupHost(cfg, tpm, flags, migration);
}
diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h
index 37813087cf..f0f16392a1 100644
--- a/src/qemu/qemu_tpm.h
+++ b/src/qemu/qemu_tpm.h
@@ -22,7 +22,7 @@
#include "vircommand.h"
-int qemuExtTPMInitPaths(virQEMUDriver *driver,
+int qemuExtTPMInitPaths(virQEMUDriverConfig *cfg,
virDomainDef *def,
virDomainTPMDef *tpm)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
@@ -35,7 +35,7 @@ int qemuExtTPMPrepareHost(virQEMUDriver *driver,
ATTRIBUTE_NONNULL(3)
G_GNUC_WARN_UNUSED_RESULT;
-void qemuExtTPMCleanupHost(virQEMUDriver *driver,
+void qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg,
virDomainTPMDef *tpm,
virDomainUndefineFlagsValues flags,
bool migration)
--
2.49.0
