From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 2/3] vnc: remove dead code
Date: Tue, 10 Mar 2015 12:18:45 +0100 [thread overview]
Message-ID: <1425986326-28797-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1425986326-28797-1-git-send-email-kraxel@redhat.com>
If vs->ws_enabled is set ws_display is non-NULL.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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
next prev parent reply other threads:[~2015-03-10 11:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-10 11:18 [Qemu-devel] [PATCH 0/3] vnc: some code cleanups Gerd Hoffmann
2015-03-10 11:18 ` [Qemu-devel] [PATCH 1/3] vnc: drop display+ws_display from VncDisplay Gerd Hoffmann
2015-03-11 1:58 ` Gonglei
2015-03-10 11:18 ` Gerd Hoffmann [this message]
2015-03-11 1:59 ` [Qemu-devel] [PATCH 2/3] vnc: remove dead code Gonglei
2015-03-10 11:18 ` [Qemu-devel] [PATCH 3/3] vnc: switch to inet_listen_opts Gerd Hoffmann
2015-03-10 15:50 ` Paolo Bonzini
2015-03-11 13:18 ` Gerd Hoffmann
2015-03-11 2:08 ` Gonglei
2015-03-11 13:20 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425986326-28797-3-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).