From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 19 Feb 2015 10:03:17 +0000 (+0100)
Subject: vnc: remove dead code
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc5c3ff75135fcc02ca3453568d212241d2bc40f;p=qemu.git

vnc: remove dead code

If vs->ws_enabled is set ws_display is non-NULL.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
---

diff --git a/ui/vnc.c b/ui/vnc.c
index 65ba1c09de..bac44ce71a 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);