| Message ID | 20211222113049.9326-2-lizhang@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | multifd: cleanup some source code | expand |
ping On 12/22/21 12:30 PM, Li Zhang wrote: > Cleanup multifd_channel_connect > > Signed-off-by: Li Zhang <lizhang@suse.de> > --- > migration/multifd.c | 49 ++++++++++++++++++++++----------------------- > 1 file changed, 24 insertions(+), 25 deletions(-) > > diff --git a/migration/multifd.c b/migration/multifd.c > index 212be1ed04..4ec40739e0 100644 > --- a/migration/multifd.c > +++ b/migration/multifd.c > @@ -801,33 +801,32 @@ static bool multifd_channel_connect(MultiFDSendParams *p, > trace_multifd_set_outgoing_channel( > ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error); > > - if (!error) { > - if (s->parameters.tls_creds && > - *s->parameters.tls_creds && > - !object_dynamic_cast(OBJECT(ioc), > - TYPE_QIO_CHANNEL_TLS)) { > - multifd_tls_channel_connect(p, ioc, &error); > - if (!error) { > - /* > - * tls_channel_connect will call back to this > - * function after the TLS handshake, > - * so we mustn't call multifd_send_thread until then > - */ > - return true; > - } else { > - return false; > - } > - } else { > - migration_ioc_register_yank(ioc); > - p->registered_yank = true; > - p->c = ioc; > - qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, > - QEMU_THREAD_JOINABLE); > - } > - return true; > + if (error) { > + return false; > } > > - return false; > + if (s->parameters.tls_creds && > + *s->parameters.tls_creds && > + !object_dynamic_cast(OBJECT(ioc), > + TYPE_QIO_CHANNEL_TLS)) { > + multifd_tls_channel_connect(p, ioc, &error); > + if (error) { > + return false; > + } > + /* > + * tls_channel_connect will call back to this > + * function after the TLS handshake, > + * so we mustn't call multifd_send_thread until then > + */ > + return true; > + } else { > + migration_ioc_register_yank(ioc); > + p->registered_yank = true; > + p->c = ioc; > + qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, > + QEMU_THREAD_JOINABLE); > + } > + return true; > } > > static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, >
Li Zhang <lizhang@suse.de> wrote: > Cleanup multifd_channel_connect > > Signed-off-by: Li Zhang <lizhang@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com> queued. > --- > migration/multifd.c | 49 ++++++++++++++++++++++----------------------- > 1 file changed, 24 insertions(+), 25 deletions(-) > > diff --git a/migration/multifd.c b/migration/multifd.c > index 212be1ed04..4ec40739e0 100644 > --- a/migration/multifd.c > +++ b/migration/multifd.c > @@ -801,33 +801,32 @@ static bool multifd_channel_connect(MultiFDSendParams *p, > trace_multifd_set_outgoing_channel( > ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error); > > - if (!error) { > - if (s->parameters.tls_creds && > - *s->parameters.tls_creds && > - !object_dynamic_cast(OBJECT(ioc), > - TYPE_QIO_CHANNEL_TLS)) { > - multifd_tls_channel_connect(p, ioc, &error); > - if (!error) { > - /* > - * tls_channel_connect will call back to this > - * function after the TLS handshake, > - * so we mustn't call multifd_send_thread until then > - */ > - return true; > - } else { > - return false; > - } > - } else { > - migration_ioc_register_yank(ioc); > - p->registered_yank = true; > - p->c = ioc; > - qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, > - QEMU_THREAD_JOINABLE); > - } > - return true; > + if (error) { > + return false; > } > > - return false; > + if (s->parameters.tls_creds && > + *s->parameters.tls_creds && > + !object_dynamic_cast(OBJECT(ioc), > + TYPE_QIO_CHANNEL_TLS)) { > + multifd_tls_channel_connect(p, ioc, &error); > + if (error) { > + return false; > + } > + /* > + * tls_channel_connect will call back to this > + * function after the TLS handshake, > + * so we mustn't call multifd_send_thread until then > + */ > + return true; > + } else { > + migration_ioc_register_yank(ioc); > + p->registered_yank = true; > + p->c = ioc; > + qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, > + QEMU_THREAD_JOINABLE); > + } > + return true; > } > > static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
diff --git a/migration/multifd.c b/migration/multifd.c index 212be1ed04..4ec40739e0 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -801,33 +801,32 @@ static bool multifd_channel_connect(MultiFDSendParams *p, trace_multifd_set_outgoing_channel( ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error); - if (!error) { - if (s->parameters.tls_creds && - *s->parameters.tls_creds && - !object_dynamic_cast(OBJECT(ioc), - TYPE_QIO_CHANNEL_TLS)) { - multifd_tls_channel_connect(p, ioc, &error); - if (!error) { - /* - * tls_channel_connect will call back to this - * function after the TLS handshake, - * so we mustn't call multifd_send_thread until then - */ - return true; - } else { - return false; - } - } else { - migration_ioc_register_yank(ioc); - p->registered_yank = true; - p->c = ioc; - qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, - QEMU_THREAD_JOINABLE); - } - return true; + if (error) { + return false; } - return false; + if (s->parameters.tls_creds && + *s->parameters.tls_creds && + !object_dynamic_cast(OBJECT(ioc), + TYPE_QIO_CHANNEL_TLS)) { + multifd_tls_channel_connect(p, ioc, &error); + if (error) { + return false; + } + /* + * tls_channel_connect will call back to this + * function after the TLS handshake, + * so we mustn't call multifd_send_thread until then + */ + return true; + } else { + migration_ioc_register_yank(ioc); + p->registered_yank = true; + p->c = ioc; + qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, + QEMU_THREAD_JOINABLE); + } + return true; } static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
Cleanup multifd_channel_connect Signed-off-by: Li Zhang <lizhang@suse.de> --- migration/multifd.c | 49 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 25 deletions(-)