[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 23/32] migration: free SocketAddress where alloca
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 23/32] migration: free SocketAddress where allocated |
Date: |
Mon, 16 Oct 2017 14:52:07 +0800 |
Freeing the SocketAddress struct in socket_start_incoming_migration is
slightly confusing. Let's free the address in the same context where we
allocated it.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/socket.c b/migration/socket.c
index dee869044a..4879f11e0f 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -172,7 +172,6 @@ static void socket_start_incoming_migration(SocketAddress
*saddr,
if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
object_unref(OBJECT(listen_ioc));
- qapi_free_SocketAddress(saddr);
return;
}
@@ -181,7 +180,6 @@ static void socket_start_incoming_migration(SocketAddress
*saddr,
socket_accept_incoming_migration,
listen_ioc,
(GDestroyNotify)object_unref);
- qapi_free_SocketAddress(saddr);
}
void tcp_start_incoming_migration(const char *host_port, Error **errp)
@@ -192,10 +190,12 @@ void tcp_start_incoming_migration(const char *host_port,
Error **errp)
socket_start_incoming_migration(saddr, &err);
}
error_propagate(errp, err);
+ qapi_free_SocketAddress(saddr);
}
void unix_start_incoming_migration(const char *path, Error **errp)
{
SocketAddress *saddr = unix_build_address(path);
socket_start_incoming_migration(saddr, errp);
+ qapi_free_SocketAddress(saddr);
}
--
2.13.5
- [Qemu-devel] [PATCH v3 13/32] migration: new state "postcopy-recover", (continued)
- [Qemu-devel] [PATCH v3 13/32] migration: new state "postcopy-recover", Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 14/32] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 15/32] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 16/32] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 17/32] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 18/32] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 19/32] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 20/32] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 21/32] migration: setup ramstate for resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 22/32] migration: final handshake for the resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 23/32] migration: free SocketAddress where allocated,
Peter Xu <=
- [Qemu-devel] [PATCH v3 24/32] migration: return incoming task tag for sockets, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 25/32] migration: return incoming task tag for exec, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 26/32] migration: return incoming task tag for fd, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 27/32] migration: store listen task tag, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 28/32] migration: allow migrate_incoming for paused VM, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 29/32] migration: init dst in migration_object_init too, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 30/32] migration: delay the postcopy-active state switch, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 31/32] migration, qmp: new command "migrate-pause", Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 32/32] migration, hmp: new command "migrate_pause", Peter Xu, 2017/10/16