Message ID | 20240222095301.171137-6-peterx@redhat.com |
---|---|
State | New |
Headers | show |
Series | migration: cleanup TLS channel referencing | expand |
peterx@redhat.com writes: > From: Peter Xu <peterx@redhat.com> > > Both socket_send_channel_destroy() and multifd_send_channel_destroy() are > unnecessary wrappers to destroy an IOC, as the only thing to do is to > release the final IOC reference. We have plenty of code that destroys an > IOC using direct unref() already; keep that style. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de>
diff --git a/migration/socket.h b/migration/socket.h index 5f52eddd4c..46c233ecd2 100644 --- a/migration/socket.h +++ b/migration/socket.h @@ -23,7 +23,6 @@ void socket_send_channel_create(QIOTaskFunc f, void *data); QIOChannel *socket_send_channel_create_sync(Error **errp); -int socket_send_channel_destroy(QIOChannel *send); void socket_start_incoming_migration(SocketAddress *saddr, Error **errp); diff --git a/migration/multifd.c b/migration/multifd.c index e901b32c19..c2eac0c3e6 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -641,16 +641,11 @@ static void multifd_send_terminate_threads(void) } } -static int multifd_send_channel_destroy(QIOChannel *send) -{ - return socket_send_channel_destroy(send); -} - static bool multifd_send_cleanup_channel(MultiFDSendParams *p, Error **errp) { if (p->c) { migration_ioc_unregister_yank(p->c); - multifd_send_channel_destroy(p->c); + object_unref(OBJECT(p->c)); p->c = NULL; } qemu_sem_destroy(&p->sem); diff --git a/migration/socket.c b/migration/socket.c index 3184c7c3c1..9ab89b1e08 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -60,13 +60,6 @@ QIOChannel *socket_send_channel_create_sync(Error **errp) return QIO_CHANNEL(sioc); } -int socket_send_channel_destroy(QIOChannel *send) -{ - /* Remove channel */ - object_unref(OBJECT(send)); - return 0; -} - struct SocketConnectData { MigrationState *s; char *hostname;