commit 85a8578ea501029f10f5d19d88115adee0ae10cc
author Peter Xu <peterx@redhat.com> Thu Jul 07 14:55:13 2022 -0400
committer Dr. David Alan Gilbert <dgilbert@redhat.com> Wed Jul 20 12:15:08 2022 +0100
tree 2817c4ec5427a9751997509b1a97ca74e01e13e0
parent c8750de11810ddca96026fc0edf87b64c1350f76

migration: Add helpers to detect TLS capability

Add migrate_channel_requires_tls() to detect whether the specific channel
requires TLS, leveraging the recently introduced migrate_use_tls().  No
functional change intended.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20220707185513.27421-1-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

migration/channel.c

diff --git a/migration/channel.c b/migration/channel.c
index 90087d8..1b08150 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -38,9 +38,7 @@
     trace_migration_set_incoming_channel(
         ioc, object_get_typename(OBJECT(ioc)));
 
-    if (migrate_use_tls() &&
-        !object_dynamic_cast(OBJECT(ioc),
-                             TYPE_QIO_CHANNEL_TLS)) {
+    if (migrate_channel_requires_tls_upgrade(ioc)) {
         migration_tls_channel_process_incoming(s, ioc, &local_err);
     } else {
         migration_ioc_register_yank(ioc);
@@ -70,10 +68,7 @@
         ioc, object_get_typename(OBJECT(ioc)), hostname, error);
 
     if (!error) {
-        if (s->parameters.tls_creds &&
-            *s->parameters.tls_creds &&
-            !object_dynamic_cast(OBJECT(ioc),
-                                 TYPE_QIO_CHANNEL_TLS)) {
+        if (migrate_channel_requires_tls_upgrade(ioc)) {
             migration_tls_channel_connect(s, ioc, hostname, &error);
 
             if (!error) {