回复: [PATCH 2/2] migration: allow enabling mutilfd for specific protocol only

[lizhij...@fujitsu.com]

there was a typo:  s/protocal/protocol

________________________________________
发件人: Li Zhijian <lizhij...@cn.fujitsu.com>
发送时间: 2021年7月16日 15:59
收件人: quint...@redhat.com; dgilb...@redhat.com
抄送: qemu-devel@nongnu.org; Li, Zhijian/李 智坚
主题: [PATCH 2/2] migration: allow enabling mutilfd for specific protocol only

And change the default to true so that '-incoming defer' can enable
multifd first.

Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
---
 migration/migration.c | 8 ++++++++
 migration/multifd.c   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index d6d48f6999b..bcc8b3bcb92 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 b3d99c79d83..372f3633eda 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_protocal_allow_multifd(bool allow)
 {
     migrate_allow_multifd = allow;
--
2.31.1