Pārlūkot izejas kodu

migration: Drop unused parameter for migration_tls_client_create()

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>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Juan Quintela 2 gadi atpakaļ
vecāks
revīzija
0deb7e9b6c
4 mainītis faili ar 5 papildinājumiem un 7 dzēšanām
  1. 1 1
      migration/multifd.c
  2. 1 1
      migration/postcopy-ram.c
  3. 2 3
      migration/tls.c
  4. 1 2
      migration/tls.h

+ 1 - 1
migration/multifd.c

@@ -821,7 +821,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
     const char *hostname = s->hostname;
     const char *hostname = s->hostname;
     QIOChannelTLS *tioc;
     QIOChannelTLS *tioc;
 
 
-    tioc = migration_tls_client_create(s, ioc, hostname, errp);
+    tioc = migration_tls_client_create(ioc, hostname, errp);
     if (!tioc) {
     if (!tioc) {
         return;
         return;
     }
     }

+ 1 - 1
migration/postcopy-ram.c

@@ -1632,7 +1632,7 @@ postcopy_preempt_send_channel_new(QIOTask *task, gpointer opaque)
     }
     }
 
 
     if (migrate_channel_requires_tls_upgrade(ioc)) {
     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) {
         if (!tioc) {
             goto out;
             goto out;
         }
         }

+ 2 - 3
migration/tls.c

@@ -114,8 +114,7 @@ static void migration_tls_outgoing_handshake(QIOTask *task,
     object_unref(OBJECT(ioc));
     object_unref(OBJECT(ioc));
 }
 }
 
 
-QIOChannelTLS *migration_tls_client_create(MigrationState *s,
-                                           QIOChannel *ioc,
+QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
                                            const char *hostname,
                                            const char *hostname,
                                            Error **errp)
                                            Error **errp)
 {
 {
@@ -141,7 +140,7 @@ void migration_tls_channel_connect(MigrationState *s,
 {
 {
     QIOChannelTLS *tioc;
     QIOChannelTLS *tioc;
 
 
-    tioc = migration_tls_client_create(s, ioc, hostname, errp);
+    tioc = migration_tls_client_create(ioc, hostname, errp);
     if (!tioc) {
     if (!tioc) {
         return;
         return;
     }
     }

+ 1 - 2
migration/tls.h

@@ -28,8 +28,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,
                                             QIOChannel *ioc,
                                             QIOChannel *ioc,
                                             Error **errp);
                                             Error **errp);
 
 
-QIOChannelTLS *migration_tls_client_create(MigrationState *s,
-                                           QIOChannel *ioc,
+QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc,
                                            const char *hostname,
                                            const char *hostname,
                                            Error **errp);
                                            Error **errp);