[PATCH 7/8] colo: Reject colo with block migration capability enabled

[Lukas Straub]

Signed-off-by: Lukas Straub <lukasstra...@web.de>
---
 migration/migration.c | 4 ----
 migration/options.c   | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index 9860f960f2..270130579f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1571,10 +1571,6 @@ static bool migrate_prepare(MigrationState *s, bool blk, 
bool blk_inc,
     }
 
     if (blk || blk_inc) {
-        if (migrate_colo()) {
-            error_setg(errp, "No disk migration is required in COLO mode");
-            return false;
-        }
         if (migrate_block() || migrate_block_incremental()) {
             error_setg(errp, "Command options are incompatible with "
                        "current migration capabilities");
diff --git a/migration/options.c b/migration/options.c
index d3d4525d40..1e9659fcb3 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -451,6 +451,11 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, 
Error **errp)
             error_setg(errp, "COLO is not compatible with postcopy");
             return false;
         }
+
+        if (new_caps[MIGRATION_CAPABILITY_BLOCK]) {
+            error_setg(errp, "COLO is not compatible with block migration");
+            return false;
+        }
     }
 #endif
 
-- 
2.39.2

pgpY2K49RL2ZB.pgp
Description: OpenPGP digital signature