OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration/multifd: Drop unnecessary helper to destroy IOC

Browse Source 
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>
This commit is contained in:
Peter Xu 2024-02-22 17:53:01 +08:00
parent 72b90b9687
commit c9a7e83c9d
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/multifd.c
View File

@ -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) static bool multifd_send_cleanup_channel(MultiFDSendParams *p, Error **errp)
{ {
if (p->c) { if (p->c) {
migration_ioc_unregister_yank(p->c); migration_ioc_unregister_yank(p->c);
multifd_send_channel_destroy(p->c); object_unref(OBJECT(p->c));
p->c = NULL; p->c = NULL;
} }
qemu_sem_destroy(&p->sem); qemu_sem_destroy(&p->sem);

7
migration/socket.c
View File

@ -60,13 +60,6 @@ QIOChannel *socket_send_channel_create_sync(Error **errp)
return QIO_CHANNEL(sioc); return QIO_CHANNEL(sioc);
} }
int socket_send_channel_destroy(QIOChannel *send)
{
/* Remove channel */
object_unref(OBJECT(send));
return 0;
}
struct SocketConnectData { struct SocketConnectData {
MigrationState *s; MigrationState *s;
char *hostname; char *hostname;

1
migration/socket.h
View File

@ -23,7 +23,6 @@
void socket_send_channel_create(QIOTaskFunc f, void *data); void socket_send_channel_create(QIOTaskFunc f, void *data);
QIOChannel *socket_send_channel_create_sync(Error **errp); QIOChannel *socket_send_channel_create_sync(Error **errp);
int socket_send_channel_destroy(QIOChannel *send);
void socket_start_incoming_migration(SocketAddress *saddr, Error **errp); void socket_start_incoming_migration(SocketAddress *saddr, Error **errp);