From 7d4961b666c2d805fa777d0fca93094c3f90cb59 Mon Sep 17 00:00:00 2001 Message-ID: <7d4961b666c2d805fa777d0fca93094c3f90cb59.1729611061.git.jdenemar@redhat.com> From: Peter Krempa Date: Fri, 27 Sep 2024 13:33:40 +0200 Subject: [PATCH] qemuMigrationSrcBeginPhaseBlockDirtyBitmaps: Use qemuMigrationAnyCopyDisk() 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 Reviewed-by: Pavel Hrdina (cherry picked from commit ab52a069eed7e7436d0b5a0ba836472f894e053b) https://issues.redhat.com/browse/RHEL-61177 --- src/qemu/qemu_migration.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 920b254351..09d4a31ca6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2449,19 +2449,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; -- 2.47.0