From: Jim Fehlig Date: Fri, 16 Jul 2021 15:09:37 +0000 (-0600) Subject: qemu: migration: Use correct flag when preparing block dirty bitmaps X-Git-Tag: v7.6.0-rc1~154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0220b2e27123907639885e591a84afc936fa80e;p=thirdparty%2Flibvirt.git 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 --- 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;