On 2015/3/10 19:18, Gerd Hoffmann wrote: > If vs->ws_enabled is set ws_display is non-NULL. > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> > --- > ui/vnc.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > Reviewed-by: Gonglei <arei.gong...@huawei.com>
> 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); >