ia64/xen-unstable

changeset 17569:5b994ca498de

ioemu: move VNC-specific switchbpp member to VncState

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri May 02 13:48:36 2008 +0100 (2008-05-02)
parents e309f53f3f83
children cd5fa4e7993f
files tools/ioemu/vl.h tools/ioemu/vnc.c
line diff
     1.1 --- a/tools/ioemu/vl.h	Fri May 02 13:48:10 2008 +0100
     1.2 +++ b/tools/ioemu/vl.h	Fri May 02 13:48:36 2008 +0100
     1.3 @@ -940,7 +940,6 @@ struct DisplayState {
     1.4      uint32_t *palette;
     1.5      uint64_t gui_timer_interval;
     1.6  
     1.7 -    int switchbpp;
     1.8      int shared_buf;
     1.9      
    1.10      void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);
     2.1 --- a/tools/ioemu/vnc.c	Fri May 02 13:48:10 2008 +0100
     2.2 +++ b/tools/ioemu/vnc.c	Fri May 02 13:48:36 2008 +0100
     2.3 @@ -198,6 +198,7 @@ struct VncState
     2.4      char *x509key;
     2.5  #endif
     2.6      char challenge[VNC_AUTH_CHALLENGE_SIZE];
     2.7 +    int switchbpp;
     2.8  
     2.9  #if CONFIG_VNC_TLS
    2.10      int wiremode;
    2.11 @@ -1686,7 +1687,7 @@ static void vnc_dpy_colourdepth(DisplayS
    2.12          default:
    2.13              return;
    2.14      }
    2.15 -    if (ds->switchbpp) {
    2.16 +    if (vs->switchbpp) {
    2.17          vnc_client_error(vs);
    2.18      } else if (vs->csock != -1 && vs->has_WMVi) {
    2.19          /* Sending a WMVi message to notify the client*/
    2.20 @@ -2647,7 +2648,7 @@ int vnc_display_open(DisplayState *ds, c
    2.21  	if (strncmp(options, "password", 8) == 0) {
    2.22  	    password = 1; /* Require password auth */
    2.23          } else if (strncmp(options, "switchbpp", 9) == 0) {
    2.24 -            ds->switchbpp = 1;
    2.25 +            vs->switchbpp = 1;
    2.26  #if CONFIG_VNC_TLS
    2.27  	} else if (strncmp(options, "tls", 3) == 0) {
    2.28  	    tls = 1; /* Require TLS */