mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
b530ccde5d
commit
e3f37b2ce6
|
@ -843,30 +843,29 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
|
||||||
ioc, object_get_typename(OBJECT(ioc)),
|
ioc, object_get_typename(OBJECT(ioc)),
|
||||||
migrate_get_current()->hostname, error);
|
migrate_get_current()->hostname, error);
|
||||||
|
|
||||||
if (!error) {
|
if (error) {
|
||||||
if (migrate_channel_requires_tls_upgrade(ioc)) {
|
return false;
|
||||||
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 (migrate_channel_requires_tls_upgrade(ioc)) {
|
||||||
return false;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
|
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
|
||||||
|
|
Loading…
Reference in New Issue