[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 07/14] migration: Add helpers to detect TLS capability
From: |
Peter Xu |
Subject: |
[PATCH v7 07/14] migration: Add helpers to detect TLS capability |
Date: |
Tue, 24 May 2022 18:11:44 -0400 |
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>
---
migration/channel.c | 9 ++-------
migration/migration.c | 1 +
migration/multifd.c | 4 +---
migration/tls.c | 9 +++++++++
migration/tls.h | 4 ++++
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index a162d00fea..bf1ff1f2a5 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -38,9 +38,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
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 @@ void migration_channel_connect(MigrationState *s,
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) {
diff --git a/migration/migration.c b/migration/migration.c
index f5f7a0f91f..d17f435d08 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -49,6 +49,7 @@
#include "trace.h"
#include "exec/target_page.h"
#include "io/channel-buffer.h"
+#include "io/channel-tls.h"
#include "migration/colo.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
diff --git a/migration/multifd.c b/migration/multifd.c
index 9282ab6aa4..265a169c5c 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -831,9 +831,7 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
migrate_get_current()->hostname, error);
if (!error) {
- if (migrate_use_tls() &&
- !object_dynamic_cast(OBJECT(ioc),
- TYPE_QIO_CHANNEL_TLS)) {
+ if (migrate_channel_requires_tls_upgrade(ioc)) {
multifd_tls_channel_connect(p, ioc, &error);
if (!error) {
/*
diff --git a/migration/tls.c b/migration/tls.c
index 32c384a8b6..73e8c9d3c2 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -166,3 +166,12 @@ void migration_tls_channel_connect(MigrationState *s,
NULL,
NULL);
}
+
+bool migrate_channel_requires_tls_upgrade(QIOChannel *ioc)
+{
+ if (!migrate_use_tls()) {
+ return false;
+ }
+
+ return !object_dynamic_cast(OBJECT(ioc), TYPE_QIO_CHANNEL_TLS);
+}
diff --git a/migration/tls.h b/migration/tls.h
index de4fe2cafd..98e23c9b0e 100644
--- a/migration/tls.h
+++ b/migration/tls.h
@@ -37,4 +37,8 @@ void migration_tls_channel_connect(MigrationState *s,
QIOChannel *ioc,
const char *hostname,
Error **errp);
+
+/* Whether the QIO channel requires further TLS handshake? */
+bool migrate_channel_requires_tls_upgrade(QIOChannel *ioc);
+
#endif
--
2.32.0
- [PATCH v7 00/14] migration: Postcopy Preemption, Peter Xu, 2022/05/24
- [PATCH v7 01/14] migration: Add postcopy-preempt capability, Peter Xu, 2022/05/24
- [PATCH v7 02/14] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/05/24
- [PATCH v7 03/14] migration: Postcopy preemption enablement, Peter Xu, 2022/05/24
- [PATCH v7 04/14] migration: Postcopy recover with preempt enabled, Peter Xu, 2022/05/24
- [PATCH v7 05/14] migration: Create the postcopy preempt channel asynchronously, Peter Xu, 2022/05/24
- [PATCH v7 07/14] migration: Add helpers to detect TLS capability,
Peter Xu <=
- [PATCH v7 06/14] migration: Add property x-postcopy-preempt-break-huge, Peter Xu, 2022/05/24
- [PATCH v7 08/14] migration: Export tls-[creds|hostname|authz] params to cmdline too, Peter Xu, 2022/05/24
- [PATCH v7 10/14] migration: Respect postcopy request order in preemption mode, Peter Xu, 2022/05/24
- [PATCH v7 11/14] tests: Move MigrateCommon upper, Peter Xu, 2022/05/24
- [PATCH v7 09/14] migration: Enable TLS for preempt channel, Peter Xu, 2022/05/24
- [PATCH v7 14/14] tests: Add postcopy preempt tests, Peter Xu, 2022/05/24
- [PATCH v7 13/14] tests: Add postcopy tls recovery migration test, Peter Xu, 2022/05/24
- [PATCH v7 12/14] tests: Add postcopy tls migration test, Peter Xu, 2022/05/24