From patchwork Thu Oct 13 09:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9374639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C7A7E60839 for ; Thu, 13 Oct 2016 09:48:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B808929F69 for ; Thu, 13 Oct 2016 09:48:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA22B29F6B; Thu, 13 Oct 2016 09:48:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23E3329F69 for ; Thu, 13 Oct 2016 09:48:56 +0000 (UTC) Received: from localhost ([::1]:38935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bucdD-0003FO-6w for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Oct 2016 05:48:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bucNw-00087T-7T for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:33:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bucNr-0002c2-MN for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:33:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bucNr-0002bF-DJ for qemu-devel@nongnu.org; Thu, 13 Oct 2016 05:33:03 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3AC0800A8 for ; Thu, 13 Oct 2016 09:33:02 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9D9X1FU025469; Thu, 13 Oct 2016 05:33:01 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id C0ED280C50; Thu, 13 Oct 2016 11:32:59 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2016 11:32:50 +0200 Message-Id: <1476351178-32540-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1476351178-32540-1-git-send-email-kraxel@redhat.com> References: <1476351178-32540-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 13 Oct 2016 09:33:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/10] ui: remove 'enabled' and 'ws_enabled' fields from VncState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: "Daniel P. Berrange" The 'ws_enabled' field is never used outside of the vnc_display_open method, so can be a local variable. The 'enabled' field is easily replaced by a check for whether 'lsock' is non-NULL. Signed-off-by: Daniel P. Berrange Message-id: 1475163940-26094-3-git-send-email-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 23 ++++++++++------------- ui/vnc.h | 2 -- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 5faf79b..45a23d3 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -371,7 +371,7 @@ VncInfo *qmp_query_vnc(Error **errp) VncDisplay *vd = vnc_display_find(NULL); SocketAddress *addr = NULL; - if (vd == NULL || !vd->enabled) { + if (vd == NULL || !vd->lsock) { info->enabled = false; } else { info->enabled = true; @@ -3169,7 +3169,6 @@ static void vnc_display_close(VncDisplay *vs) { if (!vs) return; - vs->enabled = false; vs->is_unix = false; if (vs->lsock != NULL) { if (vs->lsock_tag) { @@ -3178,7 +3177,6 @@ static void vnc_display_close(VncDisplay *vs) object_unref(OBJECT(vs->lsock)); vs->lsock = NULL; } - vs->ws_enabled = false; if (vs->lwebsock != NULL) { if (vs->lwebsock_tag) { g_source_remove(vs->lwebsock_tag); @@ -3538,6 +3536,7 @@ void vnc_display_open(const char *id, Error **errp) int acl = 0; int lock_key_sync = 1; int key_delay_ms; + bool ws_enabled = false; if (!vs) { error_setg(errp, "VNC display not active"); @@ -3573,7 +3572,7 @@ void vnc_display_open(const char *id, Error **errp) } wsaddr = g_new0(SocketAddress, 1); - vs->ws_enabled = true; + ws_enabled = true; } if (strncmp(vnc, "unix:", 5) == 0) { @@ -3581,7 +3580,7 @@ void vnc_display_open(const char *id, Error **errp) saddr->u.q_unix.data = g_new0(UnixSocketAddress, 1); saddr->u.q_unix.data->path = g_strdup(vnc + 5); - if (vs->ws_enabled) { + if (ws_enabled) { error_setg(errp, "UNIX sockets not supported with websock"); goto fail; } @@ -3617,7 +3616,7 @@ void vnc_display_open(const char *id, Error **errp) inet->ipv6 = ipv6; inet->has_ipv6 = has_ipv6; - if (vs->ws_enabled) { + if (ws_enabled) { wsaddr->type = SOCKET_ADDRESS_KIND_INET; inet = wsaddr->u.inet.data = g_new0(InetSocketAddress, 1); inet->host = g_strdup(saddr->u.inet.data->host); @@ -3777,7 +3776,7 @@ void vnc_display_open(const char *id, Error **errp) } #endif - if (vnc_display_setup_auth(vs, password, sasl, vs->ws_enabled, errp) < 0) { + if (vnc_display_setup_auth(vs, password, sasl, ws_enabled, errp) < 0) { goto fail; } @@ -3816,7 +3815,7 @@ void vnc_display_open(const char *id, Error **errp) QIOChannelSocket *sioc = NULL; vs->lsock = NULL; vs->lwebsock = NULL; - if (vs->ws_enabled) { + if (ws_enabled) { error_setg(errp, "Cannot use websockets in reverse mode"); goto fail; } @@ -3833,9 +3832,8 @@ void vnc_display_open(const char *id, Error **errp) goto fail; } vs->is_unix = saddr->type == SOCKET_ADDRESS_KIND_UNIX; - vs->enabled = true; - if (vs->ws_enabled) { + if (ws_enabled) { vs->lwebsock = qio_channel_socket_new(); if (qio_channel_socket_listen_sync(vs->lwebsock, wsaddr, errp) < 0) { @@ -3848,7 +3846,7 @@ void vnc_display_open(const char *id, Error **errp) vs->lsock_tag = qio_channel_add_watch( QIO_CHANNEL(vs->lsock), G_IO_IN, vnc_listen_io, vs, NULL); - if (vs->ws_enabled) { + if (ws_enabled) { vs->lwebsock_tag = qio_channel_add_watch( QIO_CHANNEL(vs->lwebsock), G_IO_IN, vnc_listen_io, vs, NULL); @@ -3866,8 +3864,7 @@ void vnc_display_open(const char *id, Error **errp) fail: qapi_free_SocketAddress(saddr); qapi_free_SocketAddress(wsaddr); - vs->enabled = false; - vs->ws_enabled = false; + ws_enabled = false; } void vnc_display_add_client(const char *id, int csock, bool skipauth) diff --git a/ui/vnc.h b/ui/vnc.h index ab5f244..a0519cc 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -150,7 +150,6 @@ struct VncDisplay guint lsock_tag; QIOChannelSocket *lwebsock; guint lwebsock_tag; - bool ws_enabled; DisplaySurface *ds; DisplayChangeListener dcl; kbd_layout_t *kbd_layout; @@ -167,7 +166,6 @@ struct VncDisplay const char *id; QTAILQ_ENTRY(VncDisplay) next; - bool enabled; bool is_unix; char *password; time_t expires;