From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 2 May 2008 12:48:36 +0000 (+0100)
Subject: ioemu: move VNC-specific switchbpp member to VncState
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14215^2~80
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9fdd5e05c774be485889c1fdd9959b76a3c5e1d9;p=xen.git

ioemu: move VNC-specific switchbpp member to VncState

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

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index babe8d4d27..6b103e72a9 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -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 --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
index db6c643f06..36c5f5749f 100644
--- a/tools/ioemu/vnc.c
+++ b/tools/ioemu/vnc.c
@@ -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(DisplayState *ds, int depth)
         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, const char *display, int find_unused)
 	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 */