From 382e1737d3467b76e8ade34b96afaae91509002e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 5 Nov 2015 10:12:18 +0100 Subject: 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 --- ui/vnc.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'ui') 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; -- cgit v1.1