[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/25] migration: Add migration_incoming_transport_cleanup()
From: |
Peter Xu |
Subject: |
[PATCH v2 14/25] migration: Add migration_incoming_transport_cleanup() |
Date: |
Tue, 1 Mar 2022 16:39:14 +0800 |
Add a helper to cleanup the transport listener.
When do it, we should also null-ify the cleanup hook and the data, then it's
even safe to call it multiple times.
Move the socket_address_list cleanup altogether, because that's a mirror of the
listener channels and only for the purpose of query-migrate. Hence when
someone wants to cleanup the listener transport, it should also want to cleanup
the socket list too, always.
No functional change intended.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 22 ++++++++++++++--------
migration/migration.h | 1 +
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index b2e6446457..6bb321cdd3 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -279,6 +279,19 @@ MigrationIncomingState
*migration_incoming_get_current(void)
return current_incoming;
}
+void migration_incoming_transport_cleanup(MigrationIncomingState *mis)
+{
+ if (mis->socket_address_list) {
+ qapi_free_SocketAddressList(mis->socket_address_list);
+ mis->socket_address_list = NULL;
+ }
+
+ if (mis->transport_cleanup) {
+ mis->transport_cleanup(mis->transport_data);
+ mis->transport_data = mis->transport_cleanup = NULL;
+ }
+}
+
void migration_incoming_state_destroy(void)
{
struct MigrationIncomingState *mis = migration_incoming_get_current();
@@ -299,10 +312,8 @@ void migration_incoming_state_destroy(void)
g_array_free(mis->postcopy_remote_fds, TRUE);
mis->postcopy_remote_fds = NULL;
}
- if (mis->transport_cleanup) {
- mis->transport_cleanup(mis->transport_data);
- }
+ migration_incoming_transport_cleanup(mis);
qemu_event_reset(&mis->main_thread_load_event);
if (mis->page_requested) {
@@ -310,11 +321,6 @@ void migration_incoming_state_destroy(void)
mis->page_requested = NULL;
}
- if (mis->socket_address_list) {
- qapi_free_SocketAddressList(mis->socket_address_list);
- mis->socket_address_list = NULL;
- }
-
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
}
diff --git a/migration/migration.h b/migration/migration.h
index d677a750c9..f17ccc657c 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -166,6 +166,7 @@ struct MigrationIncomingState {
MigrationIncomingState *migration_incoming_get_current(void);
void migration_incoming_state_destroy(void);
+void migration_incoming_transport_cleanup(MigrationIncomingState *mis);
/*
* Functions to work with blocktime context
*/
--
2.32.0
- [PATCH v2 02/25] migration: Finer grained tracepoints for POSTCOPY_LISTEN, (continued)
- [PATCH v2 02/25] migration: Finer grained tracepoints for POSTCOPY_LISTEN, Peter Xu, 2022/03/01
- [PATCH v2 03/25] migration: Tracepoint change in postcopy-run bottom half, Peter Xu, 2022/03/01
- [PATCH v2 04/25] migration: Introduce postcopy channels on dest node, Peter Xu, 2022/03/01
- [PATCH v2 05/25] migration: Dump ramblock and offset too when non-same-page detected, Peter Xu, 2022/03/01
- [PATCH v2 06/25] migration: Add postcopy_thread_create(), Peter Xu, 2022/03/01
- [PATCH v2 07/25] migration: Move static var in ram_block_from_stream() into global, Peter Xu, 2022/03/01
- [PATCH v2 08/25] migration: Add pss.postcopy_requested status, Peter Xu, 2022/03/01
- [PATCH v2 09/25] migration: Move migrate_allow_multifd and helpers into migration.c, Peter Xu, 2022/03/01
- [PATCH v2 10/25] migration: Enlarge postcopy recovery to capture !-EIO too, Peter Xu, 2022/03/01
- [PATCH v2 11/25] migration: postcopy_pause_fault_thread() never fails, Peter Xu, 2022/03/01
- [PATCH v2 14/25] migration: Add migration_incoming_transport_cleanup(),
Peter Xu <=
- [PATCH v2 15/25] migration: Allow migrate-recover to run multiple times, Peter Xu, 2022/03/01
- [PATCH v2 13/25] migration: Move channel setup out of postcopy_try_recover(), Peter Xu, 2022/03/01
- [PATCH v2 16/25] migration: Add postcopy-preempt capability, Peter Xu, 2022/03/01
- [PATCH v2 17/25] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/03/01
- [PATCH v2 18/25] migration: Postcopy preemption enablement, Peter Xu, 2022/03/01
- [PATCH v2 19/25] migration: Postcopy recover with preempt enabled, Peter Xu, 2022/03/01
- [PATCH v2 12/25] migration: Export ram_load_postcopy(), Peter Xu, 2022/03/01
- [PATCH v2 21/25] migration: Parameter x-postcopy-preempt-break-huge, Peter Xu, 2022/03/01
- [PATCH v2 22/25] migration: Add helpers to detect TLS capability, Peter Xu, 2022/03/01
- [PATCH v2 23/25] migration: Fail postcopy preempt with TLS for now, Peter Xu, 2022/03/01