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 babe8d4d2791bcf3475a48d20905589edc17f42b..6b103e72a953874fc0295501fa2dae8fcbd8cba8 100644 (file)
--- 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 db6c643f068de59e1062cce35ad37f8b6c194288..36c5f5749fad4863f305dce839994cb139c25c8b 100644 (file)
--- 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 */