diff mbox

[PULL,20/20] vnc: fix mismerge

Message ID 1447694735-3420-21-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann Nov. 16, 2015, 5:25 p.m. UTC 
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>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Yang Hongyang <hongyang.yang@easystack.cn>
Message-id: 1446714738-22400-1-git-send-email-kraxel@redhat.com
---
 ui/vnc.c | 2 --
 1 file changed, 2 deletions(-)
diff mbox

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index a8cce5a..369ad7b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3617,8 +3617,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;