From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 2 Dec 2025 16:45:36 +0000 (+0100)
Subject: qemuMigrationSrcToFile: Remove 'driver' argument
X-Git-Tag: v12.0.0-rc1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a5183674db41b1ecbed482c7ccbf819c8220d0;p=thirdparty%2Flibvirt.git

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 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 46a8e5d57a..6dd022163b 100644
--- 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 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;