[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] vnc: remove dead code
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/7] vnc: remove dead code |
Date: |
Thu, 12 Mar 2015 10:00:20 +0100 |
If vs->ws_enabled is set ws_display is non-NULL.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Gonglei <address@hidden>
---
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
- [Qemu-devel] [PULL 0/7] vnc patch queue., Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 2/7] vnc: remove dead code,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 6/7] vnc: avoid possible file handler leak, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 7/7] vnc: fix segmentation fault when invalid vnc parameters are specified, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 5/7] ui/console: fix OVERFLOW_BEFORE_WIDEN, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 3/7] vnc: switch to inet_listen_opts, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 4/7] ui: fix regression in x509verify parameter for VNC server, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 1/7] vnc: drop display+ws_display from VncDisplay, Gerd Hoffmann, 2015/03/12
- Re: [Qemu-devel] [PULL 0/7] vnc patch queue., Peter Maydell, 2015/03/12