From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVyyq-0000F8-GX for qemu-devel@nongnu.org; Thu, 12 Mar 2015 05:00:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVyyn-00050T-K8 for qemu-devel@nongnu.org; Thu, 12 Mar 2015 05:00:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36218) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVyyn-0004y1-46 for qemu-devel@nongnu.org; Thu, 12 Mar 2015 05:00:33 -0400 From: Gerd Hoffmann Date: Thu, 12 Mar 2015 10:00:20 +0100 Message-Id: <1426150825-782-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1426150825-782-1-git-send-email-kraxel@redhat.com> References: <1426150825-782-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/7] vnc: remove dead code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori If vs->ws_enabled is set ws_display is non-NULL. Signed-off-by: Gerd Hoffmann Reviewed-by: Gonglei --- ui/vnc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 65ba1c0..bac44ce 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3627,13 +3627,8 @@ void vnc_display_open(const char *id, Error **errp) } #ifdef CONFIG_VNC_WS if (vs->ws_enabled) { - if (ws_display) { - vs->lwebsock = inet_listen(ws_display, NULL, 0, - SOCK_STREAM, 0, errp); - } else { - vs->lwebsock = inet_listen(display, NULL, 0, - SOCK_STREAM, 5700, errp); - } + vs->lwebsock = inet_listen(ws_display, NULL, 0, + SOCK_STREAM, 0, errp); if (vs->lwebsock < 0) { if (vs->lsock) { close(vs->lsock); -- 1.8.3.1