]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuMigrationSrcBeginPhaseBlockDirtyBitmaps: Use qemuMigrationAnyCopyDisk()
authorPeter Krempa <pkrempa@redhat.com>
Fri, 27 Sep 2024 11:33:40 +0000 (13:33 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 1 Oct 2024 10:57:02 +0000 (12:57 +0200)
The function open-coded the checking whether a disk is being migrated
with non-shared storage and did so badly (not taking into account if
user doesn't explicitly provide list of disks to migrate).

Use the existing helper instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_migration.c

index b686e42e58762a355acae497f6e8c49fa9814a4e..a2c5be3e82d6a6a516cfc70cc109ae08e7e220a2 100644 (file)
@@ -2466,19 +2466,8 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigrationCookie *mig,
         if (!nodedata)
             continue;
 
-        if (migrate_disks) {
-            bool migrating = false;
-
-            for (j = 0; j < nmigrate_disks; j++) {
-                if (STREQ(migrate_disks[j], diskdef->dst)) {
-                    migrating = true;
-                    break;
-                }
-            }
-
-            if (!migrating)
-                continue;
-        }
+        if (!qemuMigrationAnyCopyDisk(diskdef, nmigrate_disks, migrate_disks))
+            continue;
 
         for (j = 0; j < nodedata->nbitmaps; j++) {
             qemuMigrationBlockDirtyBitmapsDiskBitmap *bitmap;