Re: [Qemu-devel] [PATCH 1/3] ui: remove unused 'wiremode' variable in VncState struct

[Alex Bennée]

Daniel P. Berrange <address@hidden> writes:

> Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>

> ---
>  ui/vnc-auth-vencrypt.c | 1 -
>  ui/vnc-tls.c           | 2 --
>  ui/vnc-tls.h           | 7 -------
>  ui/vnc-ws.c            | 1 -
>  4 files changed, 11 deletions(-)
>
> diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
> index bc7032e..a420ccb 100644
> --- a/ui/vnc-auth-vencrypt.c
> +++ b/ui/vnc-auth-vencrypt.c
> @@ -93,7 +93,6 @@ static int vnc_start_vencrypt_handshake(struct VncState 
> *vs) {
>      }
>  
>      VNC_DEBUG("Handshake done, switching to TLS data mode\n");
> -    vs->tls.wiremode = VNC_WIREMODE_TLS;
>      qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, vnc_client_write, 
> vs);
>  
>      start_auth_vencrypt_subauth(vs);
> diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
> index 0f59f9b..de1cb34 100644
> --- a/ui/vnc-tls.c
> +++ b/ui/vnc-tls.c
> @@ -421,14 +421,12 @@ void vnc_tls_client_cleanup(struct VncState *vs)
>          gnutls_deinit(vs->tls.session);
>          vs->tls.session = NULL;
>      }
> -    vs->tls.wiremode = VNC_WIREMODE_CLEAR;
>      g_free(vs->tls.dname);
>  #ifdef CONFIG_VNC_WS
>      if (vs->ws_tls.session) {
>          gnutls_deinit(vs->ws_tls.session);
>          vs->ws_tls.session = NULL;
>      }
> -    vs->ws_tls.wiremode = VNC_WIREMODE_CLEAR;
>      g_free(vs->ws_tls.dname);
>  #endif /* CONFIG_VNC_WS */
>  }
> diff --git a/ui/vnc-tls.h b/ui/vnc-tls.h
> index 36a2227..f9829c7 100644
> --- a/ui/vnc-tls.h
> +++ b/ui/vnc-tls.h
> @@ -33,11 +33,6 @@
>  
>  #include "qemu/acl.h"
>  
> -enum {
> -    VNC_WIREMODE_CLEAR,
> -    VNC_WIREMODE_TLS,
> -};
> -
>  typedef struct VncDisplayTLS VncDisplayTLS;
>  typedef struct VncStateTLS VncStateTLS;
>  
> @@ -55,8 +50,6 @@ struct VncDisplayTLS {
>  
>  /* Per client state */
>  struct VncStateTLS {
> -    /* Whether data is being TLS encrypted yet */
> -    int wiremode;
>      gnutls_session_t session;
>  
>      /* Client's Distinguished Name from the x509 cert */
> diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
> index d75950d..1769d52 100644
> --- a/ui/vnc-ws.c
> +++ b/ui/vnc-ws.c
> @@ -48,7 +48,6 @@ static int vncws_start_tls_handshake(struct VncState *vs)
>      }
>  
>      VNC_DEBUG("Handshake done, switching to TLS data mode\n");
> -    vs->ws_tls.wiremode = VNC_WIREMODE_TLS;
>      qemu_set_fd_handler2(vs->csock, NULL, vncws_handshake_read, NULL, vs);
>  
>      return 0;

-- 
Alex Bennée