60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
|
From dd6d0eace90285c017ae40cba0ffa95ccd963ebd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Leonardo Bras <leobras@redhat.com>
|
||
|
|
Date: Tue, 20 Jun 2023 14:51:03 -0300
|
||
|
|
Subject: [PATCH 15/15] migration: Disable postcopy + multifd migration
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Leonardo Brás <leobras@redhat.com>
|
||
|
|
RH-MergeRequest: 287: migration: Disable postcopy + multifd migration
|
||
|
|
RH-Bugzilla: 2169733
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [1/1] 07d26fbac35b7586fe790304f03d316ed26a4ef2
|
||
|
|
|
||
|
|
Since the introduction of multifd, it's possible to perform a multifd
|
||
|
|
migration and finish it using postcopy.
|
||
|
|
|
||
|
|
A bug introduced by yank (fixed on cfc3bcf373) was previously preventing
|
||
|
|
a successful use of this migration scenario, and now thing should be
|
||
|
|
working on most scenarios.
|
||
|
|
|
||
|
|
But since there is not enough testing/support nor any reported users for
|
||
|
|
this scenario, we should disable this combination before it may cause any
|
||
|
|
problems for users.
|
||
|
|
|
||
|
|
Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
||
|
|
Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
(cherry picked from commit b405dfff1ea3cf0530b628895b5a7a50dc8c6996)
|
||
|
|
[leobras: moves logic from options.c -> migration.c and use cap_list
|
||
|
|
instead of new_caps for backward compatibility]
|
||
|
|
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
||
|
|
---
|
||
|
|
migration/migration.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
||
|
|
index 817170d52d..1ad82e63f0 100644
|
||
|
|
--- a/migration/migration.c
|
||
|
|
+++ b/migration/migration.c
|
||
|
|
@@ -1246,6 +1246,11 @@ static bool migrate_caps_check(bool *cap_list,
|
||
|
|
error_setg(errp, "Postcopy is not compatible with ignore-shared");
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ if (cap_list[MIGRATION_CAPABILITY_MULTIFD]) {
|
||
|
|
+ error_setg(errp, "Postcopy is not yet compatible with multifd");
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
if (cap_list[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]) {
|
||
|
|
--
|
||
|
|
2.37.3
|
||
|
|
|