Re: [Qemu-devel] [PATCH 3/6] migration: free addr in the same function that we created it

[Peter Xu <peterx@redhat.com>]

On Mon, Oct 30, 2017 at 12:21:09PM +0100, Juan Quintela wrote:
> Otherwise, we can't use it after calling socket_start_incoming_migration
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

http://lists.gnu.org/archive/html/qemu-devel/2017-11/msg01305.html

So I got a same patch. Let's see which one will go in earlier. I think
it should be this one. :)

> ---
>  migration/socket.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/socket.c b/migration/socket.c
> index dee869044a..3a8232dd2d 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)
> @@ -191,6 +189,7 @@ void tcp_start_incoming_migration(const char *host_port, Error **errp)
>      if (!err) {
>          socket_start_incoming_migration(saddr, &err);
>      }
> +    qapi_free_SocketAddress(saddr);
>      error_propagate(errp, err);
>  }
>  
> @@ -198,4 +197,5 @@ 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.6
> 

-- 
Peter Xu