summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-02-19 11:03:17 +0100
committerGerd Hoffmann <kraxel@redhat.com>2015-03-12 08:22:07 +0100
commitfc5c3ff75135fcc02ca3453568d212241d2bc40f (patch)
tree9418b990fe57ac08af2b818cd949dda7a819a52c
parentbf7aa45e7b378691ea0e8616a2aeae2aaabb7bc3 (diff)
downloadfocaccia-qemu-fc5c3ff75135fcc02ca3453568d212241d2bc40f.tar.gz
focaccia-qemu-fc5c3ff75135fcc02ca3453568d212241d2bc40f.zip
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>
-rw-r--r--ui/vnc.c9
1 files changed, 2 insertions, 7 deletions
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);