[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/8] colo: Reject colo with block migration capability enabled
From: |
Lukas Straub |
Subject: |
[PATCH 7/8] colo: Reject colo with block migration capability enabled |
Date: |
Thu, 22 Jun 2023 14:16:28 +0200 |
Signed-off-by: Lukas Straub <lukasstraub2@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
pgpw2fI57KYAl.pgp
Description: OpenPGP digital signature
- [PATCH 0/8] colo migration cleanups, Lukas Straub, 2023/06/22
- [PATCH 1/8] colo: Only support the same qemu version on source and destination, Lukas Straub, 2023/06/22
- [PATCH 2/8] colo: Setup ram cache in normal migration path, Lukas Straub, 2023/06/22
- [PATCH 3/8] colo: Replace migration_incoming_colo_enabled() with migrate_colo(), Lukas Straub, 2023/06/22
- [PATCH 5/8] colo: Don't send ENABLE_COLO command, Lukas Straub, 2023/06/22
- [PATCH 6/8] colo: Reject colo with postcopy capability enabled, Lukas Straub, 2023/06/22
- [PATCH 4/8] colo: Remove ENABLE_COLO loadvm command functions, Lukas Straub, 2023/06/22
- [PATCH 7/8] colo: Reject colo with block migration capability enabled,
Lukas Straub <=
- [PATCH 8/8] ram: Remove useless colo special-casing, Lukas Straub, 2023/06/22