From: Gerd Hoffmann Date: Thu, 5 Nov 2015 09:12:18 +0000 (+0100) Subject: vnc: fix mismerge X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=382e1737d3467b76e8ade34b96afaae91509002e;p=qemu.git 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 Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster Reviewed-by: Yang Hongyang Message-id: 1446714738-22400-1-git-send-email-kraxel@redhat.com --- diff --git a/ui/vnc.c b/ui/vnc.c index a8cce5a45b..369ad7b11d 100644 --- 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; }