qemuMigrationSrcToFile: 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 3c6dd97c0479112d0c3527d6ba479753d8ece1c7..abe91b303ffed10aa4ae51a4dc2e2b793c465106 100644 (file)
--- 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 46a8e5d57a6e789189efc9dcb7a9845e9b180617..6dd022163b5a2830d104bb37ee023662cdd73e75 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -7257,8 +7257,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 51341f453db030c38022a60c9a7687be657159f5..db031442075bf8bc00b6c85b53813b60d71c3d70 100644 (file)
--- 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 1b68a095952f6c7ec3eb4469f502d6cf59902d60..c5620c82c53ce1f887ba7a78d5b5207d2a12f510 100644 (file)
--- 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;