Re: [Qemu-devel] [PATCH v2] migration: Fix seg with missing port

[Daniel P. Berrange]

On Tue, Sep 13, 2016 at 10:08:41AM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <address@hidden>
> 
> The command :
>    migrate tcp:localhost:
> 
>    currently segs; fix it so it now says:
> 
>    error parsing address 'localhost:'
> 
> and the same for -incoming.
> 
> Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> 
> --
> v2
>   More Error * boilerplate
> ---
>  migration/socket.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/migration/socket.c b/migration/socket.c
> index 00de1fe..a21c0c5 100644
> --- a/migration/socket.c
> +++ b/migration/socket.c
> @@ -112,8 +112,12 @@ void tcp_start_outgoing_migration(MigrationState *s,
>                                    const char *host_port,
>                                    Error **errp)
>  {
> -    SocketAddress *saddr = tcp_build_address(host_port, errp);
> -    socket_start_outgoing_migration(s, saddr, errp);
> +    Error *err = NULL;
> +    SocketAddress *saddr = tcp_build_address(host_port, &err);
> +    if (!err) {
> +        socket_start_outgoing_migration(s, saddr, &err);
> +    }
> +    error_propagate(errp, err);
>  }
>  
>  void unix_start_outgoing_migration(MigrationState *s,
> @@ -174,8 +178,12 @@ static void 
> socket_start_incoming_migration(SocketAddress *saddr,
>  
>  void tcp_start_incoming_migration(const char *host_port, Error **errp)
>  {
> -    SocketAddress *saddr = tcp_build_address(host_port, errp);
> -    socket_start_incoming_migration(saddr, errp);
> +    Error *err = NULL;
> +    SocketAddress *saddr = tcp_build_address(host_port, &err);
> +    if (!err) {
> +        socket_start_incoming_migration(saddr, &err);
> +    }
> +    error_propagate(errp, err);
>  }
>  
>  void unix_start_incoming_migration(const char *path, Error **errp)

Reviewed-by: Daniel P. Berrange <address@hidden>

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|