[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 1/6] migration/tls: save hostname into MigrationState
From: |
Chuan Zheng |
Subject: |
[PATCH v4 1/6] migration/tls: save hostname into MigrationState |
Date: |
Tue, 15 Sep 2020 11:03:57 +0800 |
hostname is need in multifd-tls, save hostname into MigrationState.
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
---
migration/channel.c | 1 +
migration/migration.c | 1 +
migration/migration.h | 5 +++++
migration/tls.c | 2 ++
4 files changed, 9 insertions(+)
diff --git a/migration/channel.c b/migration/channel.c
index 20e4c8e..8a783ba 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -90,5 +90,6 @@ void migration_channel_connect(MigrationState *s,
}
}
migrate_fd_connect(s, error);
+ g_free(s->hostname);
error_free(error);
}
diff --git a/migration/migration.c b/migration/migration.c
index 58a5452..e20b778 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1883,6 +1883,7 @@ void migrate_init(MigrationState *s)
s->migration_thread_running = false;
error_free(s->error);
s->error = NULL;
+ s->hostname = NULL;
migrate_set_state(&s->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_SETUP);
diff --git a/migration/migration.h b/migration/migration.h
index bdc7450..bc96322 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -259,6 +259,11 @@ struct MigrationState
* (which is in 4M chunk).
*/
uint8_t clear_bitmap_shift;
+
+ /*
+ * This save hostname when out-going migration starts
+ */
+ char *hostname;
};
void migrate_set_state(int *state, int old_state, int new_state);
diff --git a/migration/tls.c b/migration/tls.c
index 7a02ec8..8fbf9ac 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -154,6 +154,8 @@ void migration_tls_channel_connect(MigrationState *s,
return;
}
+ /* Save hostname into MigrationState for handshake */
+ s->hostname = g_strdup(hostname);
trace_migration_tls_outgoing_handshake_start(hostname);
qio_channel_set_name(QIO_CHANNEL(tioc), "migration-tls-outgoing");
qio_channel_tls_handshake(tioc,
--
1.8.3.1
- [PATCH v4 0/6] *** Add Multifd support for TLS migration ***, Chuan Zheng, 2020/09/14
- [PATCH v4 1/6] migration/tls: save hostname into MigrationState,
Chuan Zheng <=
- [PATCH v4 3/6] migration/tls: add tls_hostname into MultiFDSendParams, Chuan Zheng, 2020/09/14
- [PATCH v4 2/6] migration/tls: extract migration_tls_client_create for common-use, Chuan Zheng, 2020/09/14
- [PATCH v4 6/6] migration/tls: add trace points for multifd-tls, Chuan Zheng, 2020/09/14
- [PATCH v4 5/6] migration/tls: add support for multifd tls-handshake, Chuan Zheng, 2020/09/14
- [PATCH v4 4/6] migration/tls: extract cleanup function for common-use, Chuan Zheng, 2020/09/14
- Re: [PATCH v4 0/6] *** Add Multifd support for TLS migration ***, Dr. David Alan Gilbert, 2020/09/24