mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Drop multifd tls_hostname cache

Browse Source 
The hostname is cached N times, N equals to the multifd channels.

Drop that cache because after previous patch we've got s->hostname
being alive for the whole lifecycle of migration procedure.

Cc: Juan Quintela <quintela@redhat.com>
Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20220331150857.74406-3-peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Xu 2022-03-31 11:08:40 -04:00 committed by Dr. David Alan Gilbert
parent 83174765da
commit 7f692ec79a
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/multifd.c
View File

@ -542,8 +542,6 @@ void multifd_save_cleanup(void)
qemu_sem_destroy(&p->sem_sync); qemu_sem_destroy(&p->sem_sync);
g_free(p->name); g_free(p->name);
p->name = NULL; p->name = NULL;
g_free(p->tls_hostname);
p->tls_hostname = NULL;
multifd_pages_clear(p->pages); multifd_pages_clear(p->pages);
p->pages = NULL; p->pages = NULL;
p->packet_len = 0; p->packet_len = 0;
@ -763,7 +761,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
Error **errp) Error **errp)
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
const char *hostname = p->tls_hostname; const char *hostname = s->hostname;
QIOChannelTLS *tioc; QIOChannelTLS *tioc;
tioc = migration_tls_client_create(s, ioc, hostname, errp); tioc = migration_tls_client_create(s, ioc, hostname, errp);
@ -787,7 +785,8 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
trace_multifd_set_outgoing_channel( trace_multifd_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error); ioc, object_get_typename(OBJECT(ioc)),
migrate_get_current()->hostname, error);
if (!error) { if (!error) {
if (s->parameters.tls_creds && if (s->parameters.tls_creds &&
@ -874,7 +873,6 @@ int multifd_save_setup(Error **errp)
int thread_count; int thread_count;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
uint8_t i; uint8_t i;
MigrationState *s;
if (!migrate_use_multifd()) { if (!migrate_use_multifd()) {
return 0; return 0;
@ -884,7 +882,6 @@ int multifd_save_setup(Error **errp)
return -1; return -1;
} }
s = migrate_get_current();
thread_count = migrate_multifd_channels(); thread_count = migrate_multifd_channels();
multifd_send_state = g_malloc0(sizeof(*multifd_send_state)); multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
multifd_send_state->params = g_new0(MultiFDSendParams, thread_count); multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
@ -909,7 +906,6 @@ int multifd_save_setup(Error **errp)
p->packet->magic = cpu_to_be32(MULTIFD_MAGIC); p->packet->magic = cpu_to_be32(MULTIFD_MAGIC);
p->packet->version = cpu_to_be32(MULTIFD_VERSION); p->packet->version = cpu_to_be32(MULTIFD_VERSION);
p->name = g_strdup_printf("multifdsend_%d", i); p->name = g_strdup_printf("multifdsend_%d", i);
p->tls_hostname = g_strdup(s->hostname);
/* We need one extra place for the packet header */ /* We need one extra place for the packet header */
p->iov = g_new0(struct iovec, page_count + 1); p->iov = g_new0(struct iovec, page_count + 1);
p->normal = g_new0(ram_addr_t, page_count); p->normal = g_new0(ram_addr_t, page_count);

2
migration/multifd.h
View File

@ -72,8 +72,6 @@ typedef struct {
uint8_t id; uint8_t id;
/* channel thread name */ /* channel thread name */
char *name; char *name;
/* tls hostname */
char *tls_hostname;
/* channel thread id */ /* channel thread id */
QemuThread thread; QemuThread thread;
/* communication channel */ /* communication channel */