Re: [Qemu-devel] [PATCH] vnc: fix mismerge

[Markus Armbruster <armbru@redhat.com>]

Gerd Hoffmann <kraxel@redhat.com> writes:

> Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is
> specified" was rebased incorrectly, fix it.
>
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  ui/vnc.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index a47f2b3..a4fc024 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3571,8 +3571,6 @@ void vnc_display_open(const char *id, Error **errp)
>  
>              if (to) {
>                  saddr->u.inet->has_to = true;
> -                saddr->u.inet->to = to;
> -                saddr->u.inet->has_to = true;
>                  saddr->u.inet->to = to + 5900;
>              }
>              saddr->u.inet->ipv4 = saddr->u.inet->has_ipv4 = has_ipv4;

Reviewed-by: Markus Armbruster <armbru@redhat.com>