[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 3/6] migration/tls: add MigrationState and tls_hostname into M
From: |
Chuan Zheng |
Subject: |
[PATCH v3 3/6] migration/tls: add MigrationState and tls_hostname into MultiFDSendParams |
Date: |
Sun, 13 Sep 2020 10:47:33 +0800 |
MigrationState is need for tls session build and tls hostname is need
for tls handshake, add both MigrationState and tls_hostname
into MultiFDSendParams.
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
---
migration/multifd.c | 5 +++++
migration/multifd.h | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/migration/multifd.c b/migration/multifd.c
index d044120..3e41d9e 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -543,11 +543,14 @@ void multifd_save_cleanup(void)
socket_send_channel_destroy(p->c);
p->c = NULL;
+ p->s = NULL;
qemu_mutex_destroy(&p->mutex);
qemu_sem_destroy(&p->sem);
qemu_sem_destroy(&p->sem_sync);
g_free(p->name);
p->name = NULL;
+ g_free(p->tls_hostname);
+ p->tls_hostname = NULL;
multifd_pages_clear(p->pages);
p->pages = NULL;
p->packet_len = 0;
@@ -779,6 +782,8 @@ int multifd_save_setup(Error **errp)
p->packet->magic = cpu_to_be32(MULTIFD_MAGIC);
p->packet->version = cpu_to_be32(MULTIFD_VERSION);
p->name = g_strdup_printf("multifdsend_%d", i);
+ p->s = migrate_get_current();
+ p->tls_hostname = g_strdup(p->s->hostname);
socket_send_channel_create(multifd_new_send_channel_async, p);
}
diff --git a/migration/multifd.h b/migration/multifd.h
index 448a03d..2b400e7 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -66,11 +66,15 @@ typedef struct {
} MultiFDPages_t;
typedef struct {
+ /* Migration State */
+ MigrationState *s;
/* this fields are not changed once the thread is created */
/* channel number */
uint8_t id;
/* channel thread name */
char *name;
+ /* tls hostname */
+ char *tls_hostname;
/* channel thread id */
QemuThread thread;
/* communication channel */
--
1.8.3.1
[PATCH v3 1/6] migration/tls: save hostname into MigrationState, Chuan Zheng, 2020/09/12
[PATCH v3 4/6] migration/tls: extract cleanup function for common-use, Chuan Zheng, 2020/09/12
[PATCH v3 6/6] migration/tls: add trace points for multifd-tls, Chuan Zheng, 2020/09/12