diff mbox series

[v4,1/6] migration/tls: save hostname into MigrationState

Message ID 1600139042-104593-2-git-send-email-zhengchuan@huawei.com
State New
Headers show
Series *** Add Multifd support for TLS migration *** | expand

Commit Message

Zheng Chuan Sept. 15, 2020, 3:03 a.m. UTC 
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(+)

Comments

Daniel P. Berrangé Sept. 15, 2020, 8:21 a.m. UTC | #1 
On Tue, Sep 15, 2020 at 11:03:57AM +0800, Chuan Zheng wrote:
> 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(+)


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
diff mbox series

Patch

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,