From b0220b2e27123907639885e591a84afc936fa80e Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Fri, 16 Jul 2021 09:09:37 -0600 Subject: [PATCH] qemu: migration: Use correct flag when preparing block dirty bitmaps qemuMigrationSrcRunPrepareBlockDirtyBitmaps receives the flags parameter from qemuMigrationSrcRun, where flags are based on the main API enum values. Similar to commit f58349c9c6, use the main API enum instead of internal driver enum when checking flags in qemuMigrationSrcRunPrepareBlockDirtyBitmaps. Signed-off-by: Jim Fehlig Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2ec7b7c48b..a4f44b465d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3968,11 +3968,10 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmaps(virDomainObj *vm, if (qemuMigrationCookieBlockDirtyBitmapsMatchDisks(vm->def, mig->blockDirtyBitmaps) < 0) return -1; - /* For QEMU_MONITOR_MIGRATE_NON_SHARED_INC we can migrate the bitmaps - * directly, otherwise we must create merged bitmaps from the whole - * chain */ + /* For VIR_MIGRATE_NON_SHARED_INC we can migrate the bitmaps directly, + * otherwise we must create merged bitmaps from the whole chain */ - if (!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) && + if (!(flags & VIR_MIGRATE_NON_SHARED_INC) && qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(vm, mig) < 0) return -1;