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_migration.c | 3 +--
 src/qemu/qemu_migration.h | 5 ++---
 src/qemu/qemu_saveimage.c | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3c6dd97c04..abe91b303f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3136,7 +3136,7 @@ doCoreDump(virQEMUDriver *driver,
         if (!(dump_params = qemuMigrationParamsNew()))
             goto cleanup;

-        if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor,
+        if (qemuMigrationSrcToFile(vm, path, &fd, compressor,
                                    dump_params,
                                    (dump_flags & VIR_DUMP_BYPASS_CACHE),
                                    VIR_ASYNC_JOB_DUMP) < 0)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a0ec2f5ff3..8ae1e4e843 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -7254,8 +7254,7 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm,

 /* Helper function called while vm is active.  */
 int
-qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED,
-                       virDomainObj *vm,
+qemuMigrationSrcToFile(virDomainObj *vm,
                        const char *path,
                        int *fd,
                        virCommand *compressor,
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 51341f453d..db03144207 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -238,15 +238,14 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm,
                           unsigned int flags);

 int
-qemuMigrationSrcToFile(virQEMUDriver *driver,
-                       virDomainObj *vm,
+qemuMigrationSrcToFile(virDomainObj *vm,
                        const char *path,
                        int *fd,
                        virCommand *compressor,
                        qemuMigrationParams *migParams,
                        bool bypassCache,
                        virDomainAsyncJob asyncJob)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;

 int
 qemuMigrationSrcCancelUnattended(virDomainObj *vm,
diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 1b68a09595..c5620c82c5 100644
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -501,7 +501,7 @@ qemuSaveImageCreate(virQEMUDriver *driver,
         goto cleanup;

     /* Perform the migration */
-    if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor, saveParams,
+    if (qemuMigrationSrcToFile(vm, path, &fd, compressor, saveParams,
                                (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE),
                                asyncJob) < 0)
         goto cleanup;
-- 
2.52.0