|
@@ -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) {
|