diff mbox series

[v1,2/7] migration/tls: extract migration_tls_client_create for common-use

Message ID 1599663177-53993-3-git-send-email-zhengchuan@huawei.com (mailing list archive)
State New, archived
Headers show
Series *** Add Multifd support for TLS migration *** | expand

Commit Message

Zheng Chuan Sept. 9, 2020, 2:52 p.m. UTC 
migration_tls_client_create will be used in multifd-tls, let's
extract it.

Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
---
 migration/tls.c | 26 ++++++++++++++++++--------
 migration/tls.h |  6 ++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

Comments

Daniel P. Berrangé Sept. 10, 2020, 1:16 p.m. UTC | #1 
On Wed, Sep 09, 2020 at 10:52:52PM +0800, Chuan Zheng wrote:
> migration_tls_client_create will be used in multifd-tls, let's
> extract it.
> 
> Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
> Signed-off-by: Yan Jin <jinyan12@huawei.com>
> ---
>  migration/tls.c | 26 ++++++++++++++++++--------
>  migration/tls.h |  6 ++++++
>  2 files changed, 24 insertions(+), 8 deletions(-)
> 
> diff --git a/migration/tls.c b/migration/tls.c
> index 7a02ec8..e888698 100644
> --- a/migration/tls.c
> +++ b/migration/tls.c
> @@ -22,7 +22,6 @@
>  #include "channel.h"
>  #include "migration.h"
>  #include "tls.h"
> -#include "io/channel-tls.h"
>  #include "crypto/tlscreds.h"
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
> @@ -125,11 +124,10 @@ static void migration_tls_outgoing_handshake(QIOTask *task,
>      object_unref(OBJECT(ioc));
>  }
>  
> -
> -void migration_tls_channel_connect(MigrationState *s,
> -                                   QIOChannel *ioc,
> -                                   const char *hostname,
> -                                   Error **errp)
> +QIOChannelTLS *migration_tls_client_create(MigrationState *s,
> +                                 QIOChannel *ioc,
> +                                 const char *hostname,
> +                                 Error **errp)

Alignment of parameters is messed up.

>  {
>      QCryptoTLSCreds *creds;
>      QIOChannelTLS *tioc;
> @@ -137,7 +135,7 @@ void migration_tls_channel_connect(MigrationState *s,
>      creds = migration_tls_get_creds(
>          s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
>      if (!creds) {
> -        return;
> +        return NULL;
>      }
>  
>      if (s->parameters.tls_hostname && *s->parameters.tls_hostname) {
> @@ -145,11 +143,23 @@ void migration_tls_channel_connect(MigrationState *s,
>      }
>      if (!hostname) {
>          error_setg(errp, "No hostname available for TLS");
> -        return;
> +        return NULL;
>      }
>  
>      tioc = qio_channel_tls_new_client(
>          ioc, creds, hostname, errp);
> +
> +    return tioc;
> +}
> +
> +void migration_tls_channel_connect(MigrationState *s,
> +                                   QIOChannel *ioc,
> +                                   const char *hostname,
> +                                   Error **errp)
> +{
> +    QIOChannelTLS *tioc;
> +
> +    tioc = migration_tls_client_create(s, ioc, hostname, errp);
>      if (!tioc) {
>          return;
>      }
> diff --git a/migration/tls.h b/migration/tls.h
> index cdd7000..d4a0861 100644
> --- a/migration/tls.h
> +++ b/migration/tls.h
> @@ -22,11 +22,17 @@
>  #define QEMU_MIGRATION_TLS_H
>  
>  #include "io/channel.h"
> +#include "io/channel-tls.h"
>  
>  void migration_tls_channel_process_incoming(MigrationState *s,
>                                              QIOChannel *ioc,
>                                              Error **errp);
>  
> +QIOChannelTLS *migration_tls_client_create(MigrationState *s,
> +                                   QIOChannel *ioc,
> +                                   const char *hostname,
> +                                   Error **errp);

Again alignment is messed up.

Assuming that's fixed

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
Zheng Chuan Sept. 10, 2020, 1:55 p.m. UTC | #2 
On 2020/9/10 21:16, Daniel P. Berrangé wrote:
> On Wed, Sep 09, 2020 at 10:52:52PM +0800, Chuan Zheng wrote:
>> migration_tls_client_create will be used in multifd-tls, let's
>> extract it.
>>
>> Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
>> Signed-off-by: Yan Jin <jinyan12@huawei.com>
>> ---
>>  migration/tls.c | 26 ++++++++++++++++++--------
>>  migration/tls.h |  6 ++++++
>>  2 files changed, 24 insertions(+), 8 deletions(-)
>>
>> diff --git a/migration/tls.c b/migration/tls.c
>> index 7a02ec8..e888698 100644
>> --- a/migration/tls.c
>> +++ b/migration/tls.c
>> @@ -22,7 +22,6 @@
>>  #include "channel.h"
>>  #include "migration.h"
>>  #include "tls.h"
>> -#include "io/channel-tls.h"
>>  #include "crypto/tlscreds.h"
>>  #include "qemu/error-report.h"
>>  #include "qapi/error.h"
>> @@ -125,11 +124,10 @@ static void migration_tls_outgoing_handshake(QIOTask *task,
>>      object_unref(OBJECT(ioc));
>>  }
>>  
>> -
>> -void migration_tls_channel_connect(MigrationState *s,
>> -                                   QIOChannel *ioc,
>> -                                   const char *hostname,
>> -                                   Error **errp)
>> +QIOChannelTLS *migration_tls_client_create(MigrationState *s,
>> +                                 QIOChannel *ioc,
>> +                                 const char *hostname,
>> +                                 Error **errp)
> 
> Alignment of parameters is messed up.
> 
Sure, will fix in v2
>>  {
>>      QCryptoTLSCreds *creds;
>>      QIOChannelTLS *tioc;
>> @@ -137,7 +135,7 @@ void migration_tls_channel_connect(MigrationState *s,
>>      creds = migration_tls_get_creds(
>>          s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
>>      if (!creds) {
>> -        return;
>> +        return NULL;
>>      }
>>  
>>      if (s->parameters.tls_hostname && *s->parameters.tls_hostname) {
>> @@ -145,11 +143,23 @@ void migration_tls_channel_connect(MigrationState *s,
>>      }
>>      if (!hostname) {
>>          error_setg(errp, "No hostname available for TLS");
>> -        return;
>> +        return NULL;
>>      }
>>  
>>      tioc = qio_channel_tls_new_client(
>>          ioc, creds, hostname, errp);
>> +
>> +    return tioc;
>> +}
>> +
>> +void migration_tls_channel_connect(MigrationState *s,
>> +                                   QIOChannel *ioc,
>> +                                   const char *hostname,
>> +                                   Error **errp)
>> +{
>> +    QIOChannelTLS *tioc;
>> +
>> +    tioc = migration_tls_client_create(s, ioc, hostname, errp);
>>      if (!tioc) {
>>          return;
>>      }
>> diff --git a/migration/tls.h b/migration/tls.h
>> index cdd7000..d4a0861 100644
>> --- a/migration/tls.h
>> +++ b/migration/tls.h
>> @@ -22,11 +22,17 @@
>>  #define QEMU_MIGRATION_TLS_H
>>  
>>  #include "io/channel.h"
>> +#include "io/channel-tls.h"
>>  
>>  void migration_tls_channel_process_incoming(MigrationState *s,
>>                                              QIOChannel *ioc,
>>                                              Error **errp);
>>  
>> +QIOChannelTLS *migration_tls_client_create(MigrationState *s,
>> +                                   QIOChannel *ioc,
>> +                                   const char *hostname,
>> +                                   Error **errp);
> 
> Again alignment is messed up.
> 
> Assuming that's fixed
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> 
> 
> 
> Regards,
> Daniel
>
diff mbox series

Patch

diff --git a/migration/tls.c b/migration/tls.c
index 7a02ec8..e888698 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -22,7 +22,6 @@ 
 #include "channel.h"
 #include "migration.h"
 #include "tls.h"
-#include "io/channel-tls.h"
 #include "crypto/tlscreds.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
@@ -125,11 +124,10 @@  static void migration_tls_outgoing_handshake(QIOTask *task,
     object_unref(OBJECT(ioc));
 }
 
-
-void migration_tls_channel_connect(MigrationState *s,
-                                   QIOChannel *ioc,
-                                   const char *hostname,
-                                   Error **errp)
+QIOChannelTLS *migration_tls_client_create(MigrationState *s,
+                                 QIOChannel *ioc,
+                                 const char *hostname,
+                                 Error **errp)
 {
     QCryptoTLSCreds *creds;
     QIOChannelTLS *tioc;
@@ -137,7 +135,7 @@  void migration_tls_channel_connect(MigrationState *s,
     creds = migration_tls_get_creds(
         s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp);
     if (!creds) {
-        return;
+        return NULL;
     }
 
     if (s->parameters.tls_hostname && *s->parameters.tls_hostname) {
@@ -145,11 +143,23 @@  void migration_tls_channel_connect(MigrationState *s,
     }
     if (!hostname) {
         error_setg(errp, "No hostname available for TLS");
-        return;
+        return NULL;
     }
 
     tioc = qio_channel_tls_new_client(
         ioc, creds, hostname, errp);
+
+    return tioc;
+}
+
+void migration_tls_channel_connect(MigrationState *s,
+                                   QIOChannel *ioc,
+                                   const char *hostname,
+                                   Error **errp)
+{
+    QIOChannelTLS *tioc;
+
+    tioc = migration_tls_client_create(s, ioc, hostname, errp);
     if (!tioc) {
         return;
     }
diff --git a/migration/tls.h b/migration/tls.h
index cdd7000..d4a0861 100644
--- a/migration/tls.h
+++ b/migration/tls.h
@@ -22,11 +22,17 @@ 
 #define QEMU_MIGRATION_TLS_H
 
 #include "io/channel.h"
+#include "io/channel-tls.h"
 
 void migration_tls_channel_process_incoming(MigrationState *s,
                                             QIOChannel *ioc,
                                             Error **errp);
 
+QIOChannelTLS *migration_tls_client_create(MigrationState *s,
+                                   QIOChannel *ioc,
+                                   const char *hostname,
+                                   Error **errp);
+
 void migration_tls_channel_connect(MigrationState *s,
                                    QIOChannel *ioc,
                                    const char *hostname,