From fc5c3ff75135fcc02ca3453568d212241d2bc40f Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 19 Feb 2015 11:03:17 +0100 Subject: [PATCH] vnc: remove dead code 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); -- 2.7.4