vnc: fix mismerge

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

diff --git a/ui/vnc.c b/ui/vnc.c
index a8cce5a45baca6b8291f6ba9f35f1b1d626b5c6b..369ad7b11dd6b7bdd1004d12ece503899d75a3a7 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3616,8 +3616,6 @@ void vnc_display_open(const char *id, Error **errp)
                 "%d", (int)baseport + 5900);
 
             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;
             }