diff options
| author | Li Zhang <lizhang@suse.de> | 2021-12-22 12:30:48 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-02-11 16:51:09 +0100 |
| commit | e3f37b2ce613c5597cc394800874c8716ea8936a (patch) | |
| tree | b9c3e692727cfe88430806abf4207f8fcc049a0c /migration/multifd.c | |
| parent | b530ccde5dd6403d576845918f70703357871e12 (diff) | |
| download | focaccia-qemu-e3f37b2ce613c5597cc394800874c8716ea8936a.tar.gz focaccia-qemu-e3f37b2ce613c5597cc394800874c8716ea8936a.zip | |
multifd: cleanup the function multifd_channel_connect
Cleanup multifd_channel_connect Signed-off-by: Li Zhang <lizhang@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/multifd.c')
| -rw-r--r-- | migration/multifd.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index b7ad7002e0..c8132ab7e8 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -843,30 +843,29 @@ static bool multifd_channel_connect(MultiFDSendParams *p, ioc, object_get_typename(OBJECT(ioc)), migrate_get_current()->hostname, error); - if (!error) { - if (migrate_channel_requires_tls_upgrade(ioc)) { - 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; - } + if (error) { + return false; + } + if (migrate_channel_requires_tls_upgrade(ioc)) { + 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 { - 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; + 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 false; + return true; } static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, |