[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/25] migration/multifd: Cleanup outgoing_args in state destroy
From: |
peterx |
Subject: |
[PULL 09/25] migration/multifd: Cleanup outgoing_args in state destroy |
Date: |
Wed, 28 Feb 2024 13:12:59 +0800 |
From: Peter Xu <peterx@redhat.com>
outgoing_args is a global cache of socket address to be reused in multifd.
Freeing the cache in per-channel destructor is more or less a hack. Move
it to multifd_send_cleanup_state() so it only get checked once. Use a
small helper to do so because it's internal of socket.c.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: 20240222095301.171137-5-peterx@redhat.com">https://lore.kernel.org/r/20240222095301.171137-5-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/socket.h | 2 ++
migration/multifd.c | 1 +
migration/socket.c | 12 ++++++++----
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/migration/socket.h b/migration/socket.h
index 5e4c33b8ea..5f52eddd4c 100644
--- a/migration/socket.h
+++ b/migration/socket.h
@@ -29,4 +29,6 @@ void socket_start_incoming_migration(SocketAddress *saddr,
Error **errp);
void socket_start_outgoing_migration(MigrationState *s,
SocketAddress *saddr, Error **errp);
+void socket_cleanup_outgoing_migration(void);
+
#endif
diff --git a/migration/multifd.c b/migration/multifd.c
index af89e05915..fa33fd98b4 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -689,6 +689,7 @@ static bool multifd_send_cleanup_channel(MultiFDSendParams
*p, Error **errp)
static void multifd_send_cleanup_state(void)
{
+ socket_cleanup_outgoing_migration();
qemu_sem_destroy(&multifd_send_state->channels_created);
qemu_sem_destroy(&multifd_send_state->channels_ready);
g_free(multifd_send_state->params);
diff --git a/migration/socket.c b/migration/socket.c
index 98e3ea1514..3184c7c3c1 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -64,10 +64,6 @@ int socket_send_channel_destroy(QIOChannel *send)
{
/* Remove channel */
object_unref(OBJECT(send));
- if (outgoing_args.saddr) {
- qapi_free_SocketAddress(outgoing_args.saddr);
- outgoing_args.saddr = NULL;
- }
return 0;
}
@@ -137,6 +133,14 @@ void socket_start_outgoing_migration(MigrationState *s,
NULL);
}
+void socket_cleanup_outgoing_migration(void)
+{
+ if (outgoing_args.saddr) {
+ qapi_free_SocketAddress(outgoing_args.saddr);
+ outgoing_args.saddr = NULL;
+ }
+}
+
static void socket_accept_incoming_migration(QIONetListener *listener,
QIOChannelSocket *cioc,
gpointer opaque)
--
2.43.0
- [PULL 00/25] Migration next patches, peterx, 2024/02/28
- [PULL 01/25] docs/devel/migration.rst: Document the file transport, peterx, 2024/02/28
- [PULL 02/25] tests/qtest/migration: Rename fd_proto test, peterx, 2024/02/28
- [PULL 04/25] migration/multifd: Remove p->quit from recv side, peterx, 2024/02/28
- [PULL 03/25] tests/qtest/migration: Add a fd + file test, peterx, 2024/02/28
- [PULL 07/25] migration/multifd: Drop registered_yank, peterx, 2024/02/28
- [PULL 06/25] migration/multifd: Cleanup TLS iochannel referencing, peterx, 2024/02/28
- [PULL 05/25] migration/multifd: Release recv sem_sync earlier, peterx, 2024/02/28
- [PULL 08/25] migration/multifd: Make multifd_channel_connect() return void, peterx, 2024/02/28
- [PULL 09/25] migration/multifd: Cleanup outgoing_args in state destroy,
peterx <=
- [PULL 10/25] migration/multifd: Drop unnecessary helper to destroy IOC, peterx, 2024/02/28
- [PULL 11/25] notify: pass error to notifier with return, peterx, 2024/02/28
- [PULL 12/25] migration: remove error from notifier data, peterx, 2024/02/28
- [PULL 14/25] migration: MigrationEvent for notifiers, peterx, 2024/02/28
- [PULL 15/25] migration: remove postcopy_after_devices, peterx, 2024/02/28
- [PULL 13/25] migration: convert to NotifierWithReturn, peterx, 2024/02/28
- [PULL 17/25] migration: per-mode notifiers, peterx, 2024/02/28
- [PULL 20/25] migration: stop vm for cpr, peterx, 2024/02/28
- [PULL 22/25] migration: options incompatible with cpr, peterx, 2024/02/28
- [PULL 18/25] migration: refactor migrate_fd_connect failures, peterx, 2024/02/28