From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Peter Xu" <peterx@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>
Subject: [PULL 10/18] migration: Create migrate_tls_hostname() function
Date: Thu, 27 Apr 2023 17:22:26 +0200 [thread overview]
Message-ID: <20230427152234.25400-11-quintela@redhat.com> (raw)
In-Reply-To: <20230427152234.25400-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
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.40.0
next prev parent reply other threads:[~2023-04-27 15:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 15:22 [PULL 00/18] Migration 20230427 patches Juan Quintela
2023-04-27 15:22 ` [PULL 01/18] multifd: Fix the number of channels ready Juan Quintela
2023-04-27 15:22 ` [PULL 02/18] migration: Create migrate_params_init() function Juan Quintela
2023-04-27 15:22 ` [PULL 03/18] migration: Make all functions check have the same format Juan Quintela
2023-04-27 15:22 ` [PULL 04/18] migration: Create migrate_downtime_limit() function Juan Quintela
2023-04-27 15:22 ` [PULL 05/18] migration: Move migrate_set_block_incremental() to options.c Juan Quintela
2023-04-27 15:22 ` [PULL 06/18] migration: Move block_cleanup_parameters() " Juan Quintela
2023-04-27 15:22 ` [PULL 07/18] migration: Remove MigrationState from block_cleanup_parameters() Juan Quintela
2023-04-27 15:22 ` [PULL 08/18] migration: Create migrate_tls_creds() function Juan Quintela
2023-04-27 15:22 ` [PULL 09/18] migration: Create migrate_tls_authz() function Juan Quintela
2023-04-27 15:22 ` Juan Quintela [this message]
2023-04-27 15:22 ` [PULL 11/18] migration: Create migrate_block_bitmap_mapping() function Juan Quintela
2023-05-03 14:33 ` Kevin Wolf
2023-05-03 14:53 ` Juan Quintela
2023-05-03 17:10 ` Kevin Wolf
2023-05-03 17:17 ` Juan Quintela
2023-05-03 17:15 ` Juan Quintela
2023-05-03 19:00 ` Vladimir Sementsov-Ogievskiy
2023-05-04 8:38 ` Kevin Wolf
2023-05-04 10:02 ` Juan Quintela
2023-04-27 15:22 ` [PULL 12/18] migration: Move migration_properties to options.c Juan Quintela
2023-04-27 15:22 ` [PULL 13/18] multifd: Create property multifd-flush-after-each-section Juan Quintela
2023-04-27 15:22 ` [PULL 14/18] multifd: Protect multifd_send_sync_main() calls Juan Quintela
2023-04-27 15:22 ` [PULL 15/18] multifd: Only flush once each full round of memory Juan Quintela
2023-04-27 15:22 ` [PULL 16/18] stat64: Add stat64_set() operation Juan Quintela
2023-04-27 15:22 ` [PULL 17/18] migration: Make dirty_pages_rate atomic Juan Quintela
2023-04-27 15:22 ` [PULL 18/18] migration: Make dirty_bytes_last_sync atomic Juan Quintela
2023-04-28 9:55 ` [PULL 00/18] Migration 20230427 patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427152234.25400-11-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=leobras@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=wangyanan55@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).