]> xenbits.xensource.com Git - qemu-xen-unstable.git/commitdiff
vnc: fix bug: vnc server can't start when 'to' is specified
authorYang Hongyang <hongyang.yang@easystack.cn>
Tue, 27 Oct 2015 06:10:52 +0000 (14:10 +0800)
committerGerd Hoffmann <kraxel@redhat.com>
Tue, 3 Nov 2015 09:21:49 +0000 (10:21 +0100)
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 <hongyang.yang@easystack.cn>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1445926252-14830-1-git-send-email-hongyang.yang@easystack.cn
Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
ui/vnc.c

index 166d1b5b5f61f99ab90ee5958a82d6aa90686f24..a47f2b382ceb25a4df28f501884167a4e77e31e7 100644 (file)
--- 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;