* Peter Xu (pet...@redhat.com) wrote: > 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. > > Signed-off-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > --- > migration/socket.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/migration/socket.c b/migration/socket.c > index 757d382..9fc6cb3 100644 > --- a/migration/socket.c > +++ b/migration/socket.c > @@ -168,7 +168,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; > } > > @@ -177,7 +176,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) > @@ -188,10 +186,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.7.4 > > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK