7c511d7e1f
tls migration can easily reach bottleneck of cpu which results in migration failure. add support for multifd tls feature to make fully use of bandwidth.
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From ee0d1b508a144ab390fb7bc8b7a4fe3161aebecf Mon Sep 17 00:00:00 2001
|
|
From: Chuan Zheng <zhengchuan@huawei.com>
|
|
Date: Fri, 5 Mar 2021 16:09:29 +0800
|
|
Subject: [PATCH] migration/tls: fix inverted semantics in
|
|
multifd_channel_connect
|
|
|
|
Function multifd_channel_connect() return "true" to indicate failure,
|
|
which is rather confusing. Fix that.
|
|
|
|
Signed-off-by: Hao Wang <wanghao232@huawei.com>
|
|
---
|
|
migration/ram.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
|
index ba1e729c39..3338363e9d 100644
|
|
--- a/migration/ram.c
|
|
+++ b/migration/ram.c
|
|
@@ -1575,9 +1575,9 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
|
|
* function after the TLS handshake,
|
|
* so we mustn't call multifd_send_thread until then
|
|
*/
|
|
- return false;
|
|
- } else {
|
|
return true;
|
|
+ } else {
|
|
+ return false;
|
|
}
|
|
} else {
|
|
/* update for tls qio channel */
|
|
@@ -1585,10 +1585,10 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
|
|
qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
|
|
QEMU_THREAD_JOINABLE);
|
|
}
|
|
- return false;
|
|
+ return true;
|
|
}
|
|
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
|
|
@@ -1620,7 +1620,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
|
|
p->c = QIO_CHANNEL(sioc);
|
|
qio_channel_set_delay(p->c, false);
|
|
p->running = true;
|
|
- if (multifd_channel_connect(p, sioc, local_err)) {
|
|
+ if (!multifd_channel_connect(p, sioc, local_err)) {
|
|
goto cleanup;
|
|
}
|
|
return;
|
|
--
|
|
2.27.0
|
|
|