From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNXG-0003Ne-Ez for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyNXE-0000Rz-0b for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNXD-0000RT-GU for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:43 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 3B6CBC4099 for ; Mon, 16 Nov 2015 17:25:43 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 16 Nov 2015 18:25:35 +0100 Message-Id: <1447694735-3420-21-git-send-email-kraxel@redhat.com> In-Reply-To: <1447694735-3420-1-git-send-email-kraxel@redhat.com> References: <1447694735-3420-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 20/20] vnc: fix mismerge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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(-) 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; -- 1.8.3.1