@@ -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");
@@ -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
Signed-off-by: Lukas Straub <lukasstraub2@web.de> --- migration/migration.c | 4 ---- migration/options.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-)