migration: Remove unused parameters from tls functions
cover migration: Remove unused parameters from tls functions
Hi
After reorganization of the capabilities, this two functions don't use the MigrationState parameter anymore, just drop it.
Vladimir suggested it while he was doing the review.
Later, Juan.
Juan Quintela (2):
migration: Drop unused parameter for migration_tls_get_creds()
migration: Drop unused parameter for migration_tls_client_create()
migration/multifd.c | 2 +- migration/postcopy-ram.c | 2 +- migration/tls.c | 15 +++++---------- migration/tls.h | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-)
Signature · 1 line
2.40.0
PATCH 1/2 migration: Drop unused parameter for migration_tls_get_creds()
It is not needed since we moved the accessor for tls properties to options.c.
--- migration/tls.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
migration/tls.c +3 -7
@@ -29,9 +29,7 @@#include "trace.h" static QCryptoTLSCreds * -migration_tls_get_creds (MigrationState *s, -QCryptoTLSCredsEndpoint endpoint, -Error **errp) +migration_tls_get_creds (QCryptoTLSCredsEndpoint endpoint,Error **errp) {Object *creds;const char *tls_creds =migrate_tls_creds ();
@@ -80,8 +78,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,QCryptoTLSCreds *creds;QIOChannelTLS *tioc; - creds =migration_tls_get_creds ( - s,QCRYPTO_TLS_CREDS_ENDPOINT_SERVER , errp); + creds =migration_tls_get_creds (QCRYPTO_TLS_CREDS_ENDPOINT_SERVER , errp);if (!creds) {return ; }
@@ -124,8 +121,7 @@ QIOChannelTLS *migration_tls_client_create(MigrationState *s, {QCryptoTLSCreds *creds; - creds =migration_tls_get_creds ( - s,QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT , errp); + creds =migration_tls_get_creds (QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT , errp);if (!creds) {return NULL ; }
Signature · 1 line
2.40.0
Re: [PATCH 1/2] migration: Drop unused parameter for migration_tls_get_creds()
Quoted 5 lines · Juan Quintela
It is not needed since we moved the accessor for tls properties to
options.c.Suggested-by Vladimir Sementsov-Ogievskiy<[email protected]>Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 2/2 migration: Drop unused parameter for migration_tls_client_create()
In reply to Juan QuintelaIt is not needed since we moved the accessor for tls properties to options.c.
--- migration/multifd.c | 2 +- migration/postcopy-ram.c | 2 +- migration/tls.c | 5 ++--- migration/tls.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-)
migration/multifd.c +1 -1
@@ -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 ; }
migration/postcopy-ram.c +1 -1
@@ -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; }
migration/tls.c +2 -3
@@ -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 ; }
migration/tls.h +1 -2
@@ -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);
Signature · 1 line
2.40.0
Re: [PATCH 2/2] migration: Drop unused parameter for migration_tls_client_create()
Quoted 5 lines · Juan Quintela
It is not needed since we moved the accessor for tls properties to
options.c.Suggested-by Vladimir Sementsov-Ogievskiy<[email protected]>Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir