From 1f2f366c328e851f302c3a97ce4ac18f86a64279 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 2 Mar 2023 12:37:21 +0100 Subject: [PATCH] migration: Create migrate_tls_hostname() function Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- Moved the type to const char * (vladimir) --- migration/options.c | 7 +++++++ migration/options.h | 1 + migration/tls.c | 5 +++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/migration/options.c b/migration/options.c index 014aecc9ee..1aa9575bc0 100644 --- a/migration/options.c +++ b/migration/options.c @@ -596,6 +596,13 @@ const char *migrate_tls_creds(void) return s->parameters.tls_creds; } +const char *migrate_tls_hostname(void) +{ + MigrationState *s = migrate_get_current(); + + return s->parameters.tls_hostname; +} + uint64_t migrate_xbzrle_cache_size(void) { MigrationState *s = migrate_get_current(); diff --git a/migration/options.h b/migration/options.h index 987e639a49..819c1b1ce3 100644 --- a/migration/options.h +++ b/migration/options.h @@ -82,6 +82,7 @@ int migrate_multifd_zstd_level(void); uint8_t migrate_throttle_trigger_threshold(void); const char *migrate_tls_authz(void); const char *migrate_tls_creds(void); +const char *migrate_tls_hostname(void); uint64_t migrate_xbzrle_cache_size(void); /* parameters setters */ diff --git a/migration/tls.c b/migration/tls.c index 184db4d7bf..cd29177957 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -130,8 +130,9 @@ QIOChannelTLS *migration_tls_client_create(MigrationState *s, return NULL; } - if (s->parameters.tls_hostname && *s->parameters.tls_hostname) { - hostname = s->parameters.tls_hostname; + const char *tls_hostname = migrate_tls_hostname(); + if (tls_hostname && *tls_hostname) { + hostname = tls_hostname; } return qio_channel_tls_new_client(ioc, creds, hostname, errp); -- 2.11.0