[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/9] migration/tls: fix inverted semantics in multifd_channel_conn
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 6/9] migration/tls: fix inverted semantics in multifd_channel_connect |
Date: |
Mon, 15 Mar 2021 20:12:12 +0000 |
From: Hao Wang <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>
Message-Id: <20210209104237.2250941-2-wanghao232@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.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.30.2
- [PULL 0/9] virtiofs and migration queue, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 1/9] virtiofsd: Release vu_dispatch_lock when stopping queue, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 2/9] virtiofsd: Add qemu version and copyright info, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 3/9] virtiofsd: Don't allow empty filenames, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 4/9] virtiofsd: Don't allow empty paths in lookup_name(), Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 7/9] migration/tls: add error handling in multifd_tls_handshake_thread, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 5/9] virtiofsd: Convert some functions to return bool, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 8/9] monitor: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 6/9] migration/tls: fix inverted semantics in multifd_channel_connect,
Dr. David Alan Gilbert (git) <=
- [PULL 9/9] migration: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD, Dr. David Alan Gilbert (git), 2021/03/15
- Re: [PULL 0/9] virtiofs and migration queue, Peter Maydell, 2021/03/17