From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] ioemu: move VNC-specific switchbpp member to
	VncState
Date: Fri, 2 May 2008 11:47:22 +0100
Message-ID: <20080502104721.GD4819@implementation.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

ioemu: move VNC-specific switchbpp member to VncState

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r 048c883c4576 tools/ioemu/vl.h
--- a/tools/ioemu/vl.h	Fri May 02 11:45:28 2008 +0100
+++ b/tools/ioemu/vl.h	Fri May 02 11:46:08 2008 +0100
@@ -940,7 +940,6 @@ struct DisplayState {
     uint32_t *palette;
     uint64_t gui_timer_interval;
 
-    int switchbpp;
     int shared_buf;
     
     void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);
diff -r 048c883c4576 tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c	Fri May 02 11:45:28 2008 +0100
+++ b/tools/ioemu/vnc.c	Fri May 02 11:46:08 2008 +0100
@@ -198,6 +198,7 @@ struct VncState
     char *x509key;
 #endif
     char challenge[VNC_AUTH_CHALLENGE_SIZE];
+    int switchbpp;
 
 #if CONFIG_VNC_TLS
     int wiremode;
@@ -1686,7 +1687,7 @@ static void vnc_dpy_colourdepth(DisplayS
         default:
             return;
     }
-    if (ds->switchbpp) {
+    if (vs->switchbpp) {
         vnc_client_error(vs);
     } else if (vs->csock != -1 && vs->has_WMVi) {
         /* Sending a WMVi message to notify the client*/
@@ -2647,7 +2648,7 @@ int vnc_display_open(DisplayState *ds, c
 	if (strncmp(options, "password", 8) == 0) {
 	    password = 1; /* Require password auth */
         } else if (strncmp(options, "switchbpp", 9) == 0) {
-            ds->switchbpp = 1;
+            vs->switchbpp = 1;
 #if CONFIG_VNC_TLS
 	} else if (strncmp(options, "tls", 3) == 0) {
 	    tls = 1; /* Require TLS */