diff options
| author | Li Zhijian <lizhijian@cn.fujitsu.com> | 2021-09-09 09:30:52 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2021-10-19 08:39:04 +0200 |
| commit | 5ad15e8614b0877225af42aa28a7195ed2fb74e4 (patch) | |
| tree | b06fcffb1b84ef332d26520cc221a2483a3a185f /migration | |
| parent | b7acd65707623a8b728b622f4c9dd96c2085c05b (diff) | |
migration: allow enabling mutilfd for specific protocol only
To: <quintela@redhat.com>, <dgilbert@redhat.com>, <qemu-devel@nongnu.org>
CC: Li Zhijian <lizhijian@cn.fujitsu.com>
Date: Sat, 31 Jul 2021 22:05:52 +0800 (5 weeks, 4 days, 17 hours ago)
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>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 8 | ||||
| -rw-r--r-- | migration/multifd.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c index f13b07c638..9172686b89 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1237,6 +1237,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 283f672bf0..7c9deb1921 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -868,7 +868,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; |