From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45919)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1YVVvn-0006JS-35
	for qemu-devel@nongnu.org; Tue, 10 Mar 2015 21:59:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1YVVvj-0000IY-2h
	for qemu-devel@nongnu.org; Tue, 10 Mar 2015 21:59:31 -0400
Received: from szxga02-in.huawei.com ([119.145.14.65]:19404)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1YVVvi-0000I9-9o
	for qemu-devel@nongnu.org; Tue, 10 Mar 2015 21:59:27 -0400
Message-ID: <54FFA172.1090706@huawei.com>
Date: Wed, 11 Mar 2015 09:59:14 +0800
From: Gonglei <arei.gonglei@huawei.com>
MIME-Version: 1.0
References: <1425986326-28797-1-git-send-email-kraxel@redhat.com>
	<1425986326-28797-3-git-send-email-kraxel@redhat.com>
In-Reply-To: <1425986326-28797-3-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/3] vnc: remove dead code
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@amazon.com>

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 <kraxel@redhat.com>
> ---
>  ui/vnc.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
Reviewed-by: Gonglei <arei.gonglei@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);
>