@@ -823,7 +823,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
const char *hostname = s->hostname;
QIOChannelTLS *tioc;
- tioc = migration_tls_client_create(s, ioc, hostname, errp);
+ tioc = migration_tls_client_create(ioc, hostname, errp);
if (!tioc) {
return;
}
@@ -1632,7 +1632,7 @@ postcopy_preempt_send_channel_new(QIOTask *task, gpointer opaque)
}
if (migrate_channel_requires_tls_upgrade(ioc)) {
- tioc = migration_tls_client_create(s, ioc, s->hostname, &local_err);
+ tioc = migration_tls_client_create(ioc, s->hostname, &local_err);
if (!tioc) {
goto out;
}
@@ -114,8 +114,7 @@ static void migration_tls_outgoing_handshake(QIOTask *task,
object_unref(OBJECT(ioc));
}
-QIOChannelTLS *migration_tls_client_create(MigrationState *s,
- QIOChannel *ioc,
+QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
const char *hostname,
Error **errp)
{
@@ -141,7 +140,7 @@ void migration_tls_channel_connect(MigrationState *s,
{
QIOChannelTLS *tioc;
- tioc = migration_tls_client_create(s, ioc, hostname, errp);
+ tioc = migration_tls_client_create(ioc, hostname, errp);
if (!tioc) {
return;
}
@@ -28,8 +28,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
QIOChannel *ioc,
Error **errp);
-QIOChannelTLS *migration_tls_client_create(MigrationState *s,
- QIOChannel *ioc,
+QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
const char *hostname,
Error **errp);
It is not needed since we moved the accessor for tls properties to options.c. Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/multifd.c | 2 +- migration/postcopy-ram.c | 2 +- migration/tls.c | 5 ++--- migration/tls.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-)