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

migration/tls: add tls_hostname into MultiFDSendParams 

Since multifd creation is async with migration_channel_connect, we should
pass the hostname from MigrationState to MultiFDSendParams.

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

5
migration/multifd.c
View File

@ -548,6 +548,8 @@ void multifd_save_cleanup(void)
qemu_sem_destroy(&p->sem_sync); qemu_sem_destroy(&p->sem_sync);
g_free(p->name); g_free(p->name);
p->name = NULL; p->name = NULL;
g_free(p->tls_hostname);
p->tls_hostname = NULL;
multifd_pages_clear(p->pages); multifd_pages_clear(p->pages);
p->pages = NULL; p->pages = NULL;
p->packet_len = 0; p->packet_len = 0;
@ -751,10 +753,12 @@ int multifd_save_setup(Error **errp)
int thread_count; int thread_count;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
uint8_t i; uint8_t i;
MigrationState *s;
if (!migrate_use_multifd()) { if (!migrate_use_multifd()) {
return 0; return 0;
} }
s = migrate_get_current();
thread_count = migrate_multifd_channels(); thread_count = migrate_multifd_channels();
multifd_send_state = g_malloc0(sizeof(*multifd_send_state)); multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
multifd_send_state->params = g_new0(MultiFDSendParams, thread_count); multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
@ -779,6 +783,7 @@ int multifd_save_setup(Error **errp)
p->packet->magic = cpu_to_be32(MULTIFD_MAGIC); p->packet->magic = cpu_to_be32(MULTIFD_MAGIC);
p->packet->version = cpu_to_be32(MULTIFD_VERSION); p->packet->version = cpu_to_be32(MULTIFD_VERSION);
p->name = g_strdup_printf("multifdsend_%d", i); p->name = g_strdup_printf("multifdsend_%d", i);
p->tls_hostname = g_strdup(s->hostname);
socket_send_channel_create(multifd_new_send_channel_async, p); socket_send_channel_create(multifd_new_send_channel_async, p);
} }

2
migration/multifd.h
View File

@ -71,6 +71,8 @@ typedef struct {
uint8_t id; uint8_t id;
/* channel thread name */ /* channel thread name */
char *name; char *name;
/* tls hostname */
char *tls_hostname;
/* channel thread id */ /* channel thread id */
QemuThread thread; QemuThread thread;
/* communication channel */ /* communication channel */