SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Add migrate_use_tls() helper

Browse Source 
A lot of places check parameters.tls_creds in order to evaluate if TLS is
in use, and sometimes call migrate_get_current() just for that test.

Add new helper function migrate_use_tls() in order to simplify testing
for TLS usage.

Signed-off-by: Leonardo Bras <leobras@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220513062836.965425-6-leobras@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Leonardo Bras 2022-05-13 03:28:34 -03:00 committed by Dr. David Alan Gilbert
parent abb6295b3a
commit d2fafb6a68
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migration/channel.c
View File

@ -38,8 +38,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
trace_migration_set_incoming_channel( trace_migration_set_incoming_channel(
ioc, object_get_typename(OBJECT(ioc))); ioc, object_get_typename(OBJECT(ioc)));
if (s->parameters.tls_creds && if (migrate_use_tls() &&
*s->parameters.tls_creds &&
!object_dynamic_cast(OBJECT(ioc), !object_dynamic_cast(OBJECT(ioc),
TYPE_QIO_CHANNEL_TLS)) { TYPE_QIO_CHANNEL_TLS)) {
migration_tls_channel_process_incoming(s, ioc, &local_err); migration_tls_channel_process_incoming(s, ioc, &local_err);

9
migration/migration.c
View File

@ -2588,6 +2588,15 @@ bool migrate_use_zero_copy_send(void)
} }
#endif #endif
int migrate_use_tls(void)
{
MigrationState *s;
s = migrate_get_current();
return s->parameters.tls_creds && *s->parameters.tls_creds;
}
int migrate_use_xbzrle(void) int migrate_use_xbzrle(void)
{ {
MigrationState *s; MigrationState *s;

1
migration/migration.h
View File

@ -380,6 +380,7 @@ bool migrate_use_zero_copy_send(void);
#else #else
#define migrate_use_zero_copy_send() (false) #define migrate_use_zero_copy_send() (false)
#endif #endif
int migrate_use_tls(void);
int migrate_use_xbzrle(void); int migrate_use_xbzrle(void);
uint64_t migrate_xbzrle_cache_size(void); uint64_t migrate_xbzrle_cache_size(void);
bool migrate_colo_enabled(void); bool migrate_colo_enabled(void);

5
migration/multifd.c
View File

@ -782,15 +782,12 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
QIOChannel *ioc, QIOChannel *ioc,
Error *error) Error *error)
{ {
MigrationState *s = migrate_get_current();
trace_multifd_set_outgoing_channel( trace_multifd_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)), ioc, object_get_typename(OBJECT(ioc)),
migrate_get_current()->hostname, error); migrate_get_current()->hostname, error);
if (!error) { if (!error) {
if (s->parameters.tls_creds && if (migrate_use_tls() &&
*s->parameters.tls_creds &&
!object_dynamic_cast(OBJECT(ioc), !object_dynamic_cast(OBJECT(ioc),
TYPE_QIO_CHANNEL_TLS)) { TYPE_QIO_CHANNEL_TLS)) {
multifd_tls_channel_connect(p, ioc, &error); multifd_tls_channel_connect(p, ioc, &error);