From: Hao Wang <wanghao232@huawei.com>
To: <quintela@redhat.com>, <dgilbert@redhat.com>, <berrange@redhat.com>
Cc: yubihong@huawei.com, alex.chen@huawei.com,
zhang.zhanghailiang@huawei.com, qemu-devel@nongnu.org,
xiexiangyou@huawei.com, zhengchuan@huawei.com,
wanghao232@huawei.com
Subject: [PATCH v2 1/2] migration/tls: fix inverted semantics in multifd_channel_connect
Date: Tue, 9 Feb 2021 18:42:36 +0800 [thread overview]
Message-ID: <20210209104237.2250941-2-wanghao232@huawei.com> (raw)
In-Reply-To: <20210209104237.2250941-1-wanghao232@huawei.com>
Function multifd_channel_connect() return "true" to indicate failure,
which is rather confusing. Fix that.
Signed-off-by: Hao Wang <wanghao232@huawei.com>
---
migration/multifd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 1a1e589064..2a1ea85ade 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -798,9 +798,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 */
@@ -808,10 +808,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,
@@ -844,7 +844,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.23.0
next prev parent reply other threads:[~2021-02-09 14:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 10:42 [PATCH v2 0/2] add error handling in multifd_tls_handshake_thread Hao Wang
2021-02-09 10:42 ` Hao Wang [this message]
2021-02-09 10:46 ` [PATCH v2 1/2] migration/tls: fix inverted semantics in multifd_channel_connect Daniel P. Berrangé
2021-03-06 9:08 ` Zheng Chuan
2021-02-09 10:42 ` [PATCH v2 2/2] migration/tls: add error handling in multifd_tls_handshake_thread Hao Wang
2021-02-09 10:46 ` Daniel P. Berrangé
2021-03-06 9:08 ` Zheng Chuan
2021-03-15 17:20 ` [PATCH v2 0/2] " Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210209104237.2250941-2-wanghao232@huawei.com \
--to=wanghao232@huawei.com \
--cc=alex.chen@huawei.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=xiexiangyou@huawei.com \
--cc=yubihong@huawei.com \
--cc=zhang.zhanghailiang@huawei.com \
--cc=zhengchuan@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).