openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration/tls: extract cleanup function for common-use 

multifd channel cleanup is need if multifd handshake failed,
let's extract it.

Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <1600139042-104593-5-git-send-email-zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Chuan Zheng 2020-09-15 11:04:00 +08:00 committed by Dr. David Alan Gilbert
parent 8e5fa05932
commit 03c7a42d0d
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
migration/multifd.c
View File

@ -719,6 +719,23 @@ out:
return NULL; return NULL;
} }
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
QIOChannel *ioc, Error *err)
{
migrate_set_error(migrate_get_current(), err);
/* Error happen, we need to tell who pay attention to me */
qemu_sem_post(&multifd_send_state->channels_ready);
qemu_sem_post(&p->sem_sync);
/*
* Although multifd_send_thread is not created, but main migration
* thread neet to judge whether it is running, so we need to mark
* its status.
*/
p->quit = true;
object_unref(OBJECT(ioc));
error_free(err);
}
static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
{ {
MultiFDSendParams *p = opaque; MultiFDSendParams *p = opaque;
@ -727,25 +744,18 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
trace_multifd_new_send_channel_async(p->id); trace_multifd_new_send_channel_async(p->id);
if (qio_task_propagate_error(task, &local_err)) { if (qio_task_propagate_error(task, &local_err)) {
migrate_set_error(migrate_get_current(), local_err); goto cleanup;
/* Error happen, we need to tell who pay attention to me */
qemu_sem_post(&multifd_send_state->channels_ready);
qemu_sem_post(&p->sem_sync);
/*
* Although multifd_send_thread is not created, but main migration
* thread needs to judge whether it is running, so we need to mark
* its status.
*/
p->quit = true;
object_unref(OBJECT(sioc));
error_free(local_err);
} else { } else {
p->c = QIO_CHANNEL(sioc); p->c = QIO_CHANNEL(sioc);
qio_channel_set_delay(p->c, false); qio_channel_set_delay(p->c, false);
p->running = true; p->running = true;
qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
QEMU_THREAD_JOINABLE); QEMU_THREAD_JOINABLE);
return;
} }
cleanup:
multifd_new_send_channel_cleanup(p, sioc, local_err);
} }
int multifd_save_setup(Error **errp) int multifd_save_setup(Error **errp)