Re: [Qemu-devel] [PULL 6/6] vnc: fix bug: vnc server can't start when 'to' is specified

[Markus Armbruster]

Gerd Hoffmann <address@hidden> writes:

> From: Yang Hongyang <address@hidden>
>
> commit e0d03b8ceb52 converted VNC startup to use SocketAddress,
> the interface socket_listen don't have a port_offset param, so
> we need to add the port offset (5900) to both 'port' and 'to' opts.
> currently only 'port' is added by offset.
> This patch add the port offset to 'to' opts.
>
> Signed-off-by: Yang Hongyang <address@hidden>
> Reviewed-by: Daniel P. Berrange <address@hidden>
> Message-id: address@hidden
> Cc: Daniel P. Berrange <address@hidden>
> Cc: Eric Blake <address@hidden>
> Cc: Gerd Hoffmann <address@hidden>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  ui/vnc.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 166d1b5..a47f2b3 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3572,6 +3572,8 @@ 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;
>              saddr->u.inet->ipv6 = saddr->u.inet->has_ipv6 = has_ipv6;

Mismerge!

Message-id in the commit message points to the original patch:

  diff --git a/ui/vnc.c b/ui/vnc.c
  index faff054..db24545 100644
  --- a/ui/vnc.c
  +++ b/ui/vnc.c
  @@ -3545,7 +3545,7 @@ void vnc_display_open(const char *id, Error **errp)

               if (to) {
                   saddr->inet->has_to = true;
  -                saddr->inet->to = to;
  +                saddr->inet->to = to + 5900;
               }
               saddr->inet->ipv4 = saddr->inet->has_ipv4 = has_ipv4;
               saddr->inet->ipv6 = saddr->inet->has_ipv6 = has_ipv6;
  -- 
  2.5.0

Please fix.