motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

multifd: cleanup the function multifd_channel_connect

Browse source 
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>
This commit is contained in:
Li Zhang 2021-12-22 12:30:48 +01:00 • committed by Juan Quintela
parent b530ccde5d
commit e3f37b2ce6
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
migration/multifd.c
View file

@ -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,