From: Peter Krempa <pkrempa@redhat.com>
We pass in 'vm' which contains it in the private data.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_saveimage.c | 6 +++---
src/qemu/qemu_saveimage.h | 3 +--
src/qemu/qemu_snapshot.c | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index abe91b303f..3f154969b8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2682,7 +2682,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
(flags & VIR_DOMAIN_SAVE_BYPASS_CACHE))))
goto endjob;
- ret = qemuSaveImageCreate(driver, vm, path, data, compressor,
+ ret = qemuSaveImageCreate(vm, path, data, compressor,
saveParams, flags, VIR_ASYNC_JOB_SAVE);
if (ret < 0)
goto endjob;
diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index a2e760c462..09217a9c9d 100644
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -475,8 +475,7 @@ qemuSaveImageCreateFd(virDomainObj *vm,
* the caller needs to make sure that the processors are stopped and do all other
* actions besides saving memory */
int
-qemuSaveImageCreate(virQEMUDriver *driver,
- virDomainObj *vm,
+qemuSaveImageCreate(virDomainObj *vm,
const char *path,
virQEMUSaveData *data,
virCommand *compressor,
@@ -484,7 +483,8 @@ qemuSaveImageCreate(virQEMUDriver *driver,
unsigned int flags,
virDomainAsyncJob asyncJob)
{
- g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+ qemuDomainObjPrivate *priv = vm->privateData;
+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
bool needUnlink = false;
int ret = -1;
int fd = -1;
diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h
index 1fd96751a2..b46cabffe5 100644
--- a/src/qemu/qemu_saveimage.h
+++ b/src/qemu/qemu_saveimage.h
@@ -119,8 +119,7 @@ qemuSaveImageDecompressionStop(virCommand *cmd,
const char *path);
int
-qemuSaveImageCreate(virQEMUDriver *driver,
- virDomainObj *vm,
+qemuSaveImageCreate(virDomainObj *vm,
const char *path,
virQEMUSaveData *data,
virCommand *compressor,
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 5ceaff3554..c8954fd805 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1756,7 +1756,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
if (!(snap_params = qemuMigrationParamsNew()))
goto cleanup;
- if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile,
+ if (qemuSaveImageCreate(vm, snapdef->memorysnapshotfile,
data, compressor, snap_params, 0,
VIR_ASYNC_JOB_SNAPSHOT) < 0)
goto cleanup;
--
2.52.0