From b88f4ba8f28d5d545aac6d3a4d0607d1312789f2 Mon Sep 17 00:00:00 2001
From: Chen Qun <kuhn.chenqun@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>
---
 ...x-inverted-semantics-in-multifd_chan.patch | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 migration-tls-fix-inverted-semantics-in-multifd_chan.patch

diff --git a/migration-tls-fix-inverted-semantics-in-multifd_chan.patch b/migration-tls-fix-inverted-semantics-in-multifd_chan.patch
new file mode 100644
index 0000000..3f5a52a
--- /dev/null
+++ b/migration-tls-fix-inverted-semantics-in-multifd_chan.patch
@@ -0,0 +1,55 @@
+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
+