aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Zhijian <lizhijian@cn.fujitsu.com>2021-09-09 09:30:52 +0200
committerJuan Quintela <quintela@redhat.com>2021-10-19 08:39:04 +0200
commit5ad15e8614b0877225af42aa28a7195ed2fb74e4 (patch)
treeb06fcffb1b84ef332d26520cc221a2483a3a185f
parentb7acd65707623a8b728b622f4c9dd96c2085c05b (diff)
downloadqemu-5ad15e8614b0877225af42aa28a7195ed2fb74e4.zip
qemu-5ad15e8614b0877225af42aa28a7195ed2fb74e4.tar.gz
qemu-5ad15e8614b0877225af42aa28a7195ed2fb74e4.tar.bz2
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>
-rw-r--r--migration/migration.c8
-rw-r--r--migration/multifd.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c
index f13b07c..9172686 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 283f672..7c9deb1 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;