qemuSaveImageCreate: Remove 'driver' argument

We pass in 'vm' which contains it in the private data.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index abe91b303ffed10aa4ae51a4dc2e2b793c465106..3f154969b863cd744a692de9920733b601aa0408 100644 (file)
--- 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 a2e760c462efdb2ce06874a1dcc2ed93918917f2..09217a9c9df0dadaf17a3ea9373663d155a2b1ac 100644 (file)
--- 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 1fd96751a252e0e20986eb84538704c6a40b8e3e..b46cabffe5fdbab90f0bd4f2459604dd37125484 100644 (file)
--- 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 e44b805689be404edbb543e6f15ee99935f3bdbd..0338641559a6bdd57dad0cb692cc33e53b4e0280 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1760,7 +1760,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;