diff options
| author | Peter Xu <peterx@redhat.com> | 2024-02-22 17:53:01 +0800 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-02-28 11:31:28 +0800 |
| commit | c9a7e83c9d64fd5ebc759186789e1b753c919d32 (patch) | |
| tree | 0f8a9fdf9b56e40cd3ae942519f9d21721c4deb0 | |
| parent | 72b90b96872acc5d00f9c16dfc196543349361da (diff) | |
| download | qemu-c9a7e83c9d64fd5ebc759186789e1b753c919d32.zip qemu-c9a7e83c9d64fd5ebc759186789e1b753c919d32.tar.gz qemu-c9a7e83c9d64fd5ebc759186789e1b753c919d32.tar.bz2 | |
migration/multifd: Drop unnecessary helper to destroy IOC
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.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240222095301.171137-6-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
| -rw-r--r-- | migration/multifd.c | 7 | ||||
| -rw-r--r-- | migration/socket.c | 7 | ||||
| -rw-r--r-- | migration/socket.h | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index fa33fd9..6c07f19 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -659,16 +659,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 3184c7c..9ab89b1 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; diff --git a/migration/socket.h b/migration/socket.h index 5f52edd..46c233e 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); |