[PATCH 22/80] qemuMigrationSrcNBDStorageCopyBlockdev: Remove some arguments

[Peter Krempa]

We no longer need the arguments which were conditionally filled based on
presence of the QEMU_CAPS_BLOCKDEV feature.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ef24a1dedf..042e8bb10a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1025,9 +1025,6 @@ static int
 qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
                                        virDomainObj *vm,
                                        virDomainDiskDef *disk,
-                                       const char *jobname,
-                                       const char *sourcename,
-                                       bool persistjob,
                                        const char *host,
                                        int port,
                                        const char *socket,
@@ -1041,6 +1038,10 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
     qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     int mon_ret = 0;
     g_autoptr(virStorageSource) copysrc = NULL;
+    g_autofree char *diskAlias = qemuAliasDiskDriveFromDisk(disk);
+
+    if (!diskAlias)
+        return -1;

     VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", disk->dst, host);

@@ -1062,8 +1063,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
     mon_ret = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), data);

     if (mon_ret == 0)
-        mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), jobname, persistjob,
-                                            sourcename, copysrc->nodeformat,
+        mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true,
+                                            qemuDomainDiskGetTopNodename(disk),
+                                            copysrc->nodeformat,
                                             mirror_speed, 0, 0, mirror_shallow,
                                             syncWrites);

@@ -1109,9 +1111,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver,
     qemuBlockJobSyncBegin(job);

     rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
-                                                disk, diskAlias,
-                                                qemuDomainDiskGetTopNodename(disk),
-                                                true,
+                                                disk,
                                                 host, port, socket,
                                                 mirror_speed,
                                                 mirror_shallow,
-- 
2.36.1