| Message ID | 20210209104237.2250941-2-wanghao232@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add error handling in multifd_tls_handshake_thread | expand |
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> On 2021/2/9 18:42, Hao Wang wrote: > 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; >
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;
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(-)