| Message ID | 20210731140552.8818-2-lizhijian@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] migration: allow multifd for socket protocol only | expand |
Li Zhijian <lizhijian@cn.fujitsu.com> wrote: > And change the default to true so that in '-incoming defer' case, user is able > to change multifd capability. > > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/migration/migration.c b/migration/migration.c index 212314541f1..b4d0e66cf7b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1249,6 +1249,14 @@ static bool migrate_caps_check(bool *cap_list, } } + /* incoming side only */ + if (runstate_check(RUN_STATE_INMIGRATE) && + !migrate_multifd_is_allowed() && + cap_list[MIGRATION_CAPABILITY_MULTIFD]) { + error_setg(errp, "multifd is not supported by current protocol"); + return false; + } + return true; } diff --git a/migration/multifd.c b/migration/multifd.c index 4a4d16d3888..4643b25c9db 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -864,7 +864,7 @@ cleanup: multifd_new_send_channel_cleanup(p, sioc, local_err); } -static bool migrate_allow_multifd; +static bool migrate_allow_multifd = true; void migrate_protocol_allow_multifd(bool allow) { migrate_allow_multifd = allow;
And change the default to true so that in '-incoming defer' case, user is able to change multifd capability. Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> --- migration/migration.c | 8 ++++++++ migration/multifd.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)