From 3ba024457facdb6b0ef9c5c742261d4080a80a11 Mon Sep 17 00:00:00 2001 From: Rao, Lei Date: Tue, 8 Jun 2021 16:23:28 +0800 Subject: Remove migrate_set_block_enabled in checkpoint We can detect disk migration in migrate_prepare, if disk migration is enabled in COLO mode, we can directly report an error.and there is no need to disable block migration at every checkpoint. Signed-off-by: Lei Rao Signed-off-by: Zhang Chen Reviewed-by: Li Zhijian Reviewed-by: Zhang Chen Reviewed-by: Lukas Straub Tested-by: Lukas Straub Signed-off-by: Jason Wang --- migration/migration.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'migration/migration.c') diff --git a/migration/migration.c b/migration/migration.c index 393299e150..4828997f63 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2217,6 +2217,10 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, } if (blk || blk_inc) { + if (migrate_colo_enabled()) { + error_setg(errp, "No disk migration is required in COLO mode"); + return false; + } if (migrate_use_block() || migrate_use_block_incremental()) { error_setg(errp, "Command options are incompatible with " "current migration capabilities"); -- cgit v1.2.3-55-g7522