Index: /trunk/src/VBox/Devices/Input/DevPS2.cpp
===================================================================
--- /trunk/src/VBox/Devices/Input/DevPS2.cpp	(revision 49881)
+++ /trunk/src/VBox/Devices/Input/DevPS2.cpp	(revision 49882)
@@ -46,5 +46,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_KBD
-#include "vl_vbox.h"
 #include <VBox/vmm/pdmdev.h>
 #include <iprt/assert.h>
@@ -1075,5 +1074,5 @@
 }
 
-static void kbd_save(QEMUFile* f, void* opaque)
+static void kbd_save(PSSMHANDLE pSSM, KBDState *s)
 {
 #ifndef VBOX_WITH_NEW_PS2M
@@ -1081,44 +1080,43 @@
     int i;
 #endif
-    KBDState *s = (KBDState*)opaque;
-
-    qemu_put_8s(f, &s->write_cmd);
-    qemu_put_8s(f, &s->status);
-    qemu_put_8s(f, &s->mode);
-    qemu_put_8s(f, &s->dbbout);
+
+    SSMR3PutU8(pSSM, s->write_cmd);
+    SSMR3PutU8(pSSM, s->status);
+    SSMR3PutU8(pSSM, s->mode);
+    SSMR3PutU8(pSSM, s->dbbout);
 #ifndef VBOX_WITH_NEW_PS2M
-    qemu_put_be32s(f, &s->mouse_write_cmd);
-    qemu_put_8s(f, &s->mouse_status);
-    qemu_put_8s(f, &s->mouse_resolution);
-    qemu_put_8s(f, &s->mouse_sample_rate);
-    qemu_put_8s(f, &s->mouse_wrap);
-    qemu_put_8s(f, &s->mouse_type);
-    qemu_put_8s(f, &s->mouse_detect_state);
-    qemu_put_be32s(f, &s->mouse_dx);
-    qemu_put_be32s(f, &s->mouse_dy);
-    qemu_put_be32s(f, &s->mouse_dz);
-    qemu_put_be32s(f, &s->mouse_dw);
-    qemu_put_be32s(f, &s->mouse_flags);
-    qemu_put_8s(f, &s->mouse_buttons);
-    qemu_put_8s(f, &s->mouse_buttons_reported);
+    SSMR3PutU32(pSSM, s->mouse_write_cmd);
+    SSMR3PutU8(pSSM, s->mouse_status);
+    SSMR3PutU8(pSSM, s->mouse_resolution);
+    SSMR3PutU8(pSSM, s->mouse_sample_rate);
+    SSMR3PutU8(pSSM, s->mouse_wrap);
+    SSMR3PutU8(pSSM, s->mouse_type);
+    SSMR3PutU8(pSSM, s->mouse_detect_state);
+    SSMR3PutU32(pSSM, s->mouse_dx);
+    SSMR3PutU32(pSSM, s->mouse_dy);
+    SSMR3PutU32(pSSM, s->mouse_dz);
+    SSMR3PutU32(pSSM, s->mouse_dw);
+    SSMR3PutU32(pSSM, s->mouse_flags);
+    SSMR3PutU8(pSSM, s->mouse_buttons);
+    SSMR3PutU8(pSSM, s->mouse_buttons_reported);
 
     cItems = s->mouse_command_queue.count;
-    SSMR3PutU32(f, cItems);
+    SSMR3PutU32(pSSM, cItems);
     for (i = s->mouse_command_queue.rptr; cItems-- > 0; i = (i + 1) % RT_ELEMENTS(s->mouse_command_queue.data))
-        SSMR3PutU8(f, s->mouse_command_queue.data[i]);
+        SSMR3PutU8(pSSM, s->mouse_command_queue.data[i]);
     Log(("kbd_save: %d mouse command queue items stored\n", s->mouse_command_queue.count));
 
     cItems = s->mouse_event_queue.count;
-    SSMR3PutU32(f, cItems);
+    SSMR3PutU32(pSSM, cItems);
     for (i = s->mouse_event_queue.rptr; cItems-- > 0; i = (i + 1) % RT_ELEMENTS(s->mouse_event_queue.data))
-        SSMR3PutU8(f, s->mouse_event_queue.data[i]);
+        SSMR3PutU8(pSSM, s->mouse_event_queue.data[i]);
     Log(("kbd_save: %d mouse event queue items stored\n", s->mouse_event_queue.count));
 #endif
 
     /* terminator */
-    SSMR3PutU32(f, ~0);
-}
-
-static int kbd_load(QEMUFile* f, void* opaque, int version_id)
+    SSMR3PutU32(pSSM, ~0);
+}
+
+static int kbd_load(PSSMHANDLE pSSM, KBDState *s, uint32_t version_id)
 {
     uint32_t    u32, i;
@@ -1126,5 +1124,4 @@
     uint32_t u32Dummy;
     int         rc;
-    KBDState *s = (KBDState*)opaque;
 
 #if 0
@@ -1136,42 +1133,42 @@
     if (version_id < 2 || version_id > PCKBD_SAVED_STATE_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-    qemu_get_8s(f, &s->write_cmd);
-    qemu_get_8s(f, &s->status);
-    qemu_get_8s(f, &s->mode);
+    SSMR3GetU8(pSSM, &s->write_cmd);
+    SSMR3GetU8(pSSM, &s->status);
+    SSMR3GetU8(pSSM, &s->mode);
     if (version_id <= 5)
     {
-        qemu_get_be32s(f, (uint32_t *)&u32Dummy);
-        qemu_get_be32s(f, (uint32_t *)&u32Dummy);
+        SSMR3GetU32(pSSM, (uint32_t *)&u32Dummy);
+        SSMR3GetU32(pSSM, (uint32_t *)&u32Dummy);
     }
     else
     {
-        qemu_get_8s(f, &s->dbbout);
+        SSMR3GetU8(pSSM, &s->dbbout);
     }
 #ifndef VBOX_WITH_NEW_PS2M
-    qemu_get_be32s(f, (uint32_t *)&s->mouse_write_cmd);
-    qemu_get_8s(f, &s->mouse_status);
-    qemu_get_8s(f, &s->mouse_resolution);
-    qemu_get_8s(f, &s->mouse_sample_rate);
-    qemu_get_8s(f, &s->mouse_wrap);
-    qemu_get_8s(f, &s->mouse_type);
-    qemu_get_8s(f, &s->mouse_detect_state);
-    qemu_get_be32s(f, (uint32_t *)&s->mouse_dx);
-    qemu_get_be32s(f, (uint32_t *)&s->mouse_dy);
-    qemu_get_be32s(f, (uint32_t *)&s->mouse_dz);
+    SSMR3GetU32(pSSM, (uint32_t *)&s->mouse_write_cmd);
+    SSMR3GetU8(pSSM, &s->mouse_status);
+    SSMR3GetU8(pSSM, &s->mouse_resolution);
+    SSMR3GetU8(pSSM, &s->mouse_sample_rate);
+    SSMR3GetU8(pSSM, &s->mouse_wrap);
+    SSMR3GetU8(pSSM, &s->mouse_type);
+    SSMR3GetU8(pSSM, &s->mouse_detect_state);
+    SSMR3GetU32(pSSM, (uint32_t *)&s->mouse_dx);
+    SSMR3GetU32(pSSM, (uint32_t *)&s->mouse_dy);
+    SSMR3GetU32(pSSM, (uint32_t *)&s->mouse_dz);
     if (version_id > 2)
     {
-        SSMR3GetS32(f, &s->mouse_dw);
-        SSMR3GetS32(f, &s->mouse_flags);
-    }
-    qemu_get_8s(f, &s->mouse_buttons);
+        SSMR3GetS32(pSSM, &s->mouse_dw);
+        SSMR3GetS32(pSSM, &s->mouse_flags);
+    }
+    SSMR3GetU8(pSSM, &s->mouse_buttons);
     if (version_id == 4)
     {
-        SSMR3GetU32(f, &u32Dummy);
-        SSMR3GetU32(f, &u32Dummy);
+        SSMR3GetU32(pSSM, &u32Dummy);
+        SSMR3GetU32(pSSM, &u32Dummy);
     }
     if (version_id > 3)
-        SSMR3GetU8(f, &s->mouse_buttons_reported);
+        SSMR3GetU8(pSSM, &s->mouse_buttons_reported);
     if (version_id == 4)
-        SSMR3GetU8(f, &u8Dummy);
+        SSMR3GetU8(pSSM, &u8Dummy);
     s->mouse_command_queue.count = 0;
     s->mouse_command_queue.rptr = 0;
@@ -1190,10 +1187,10 @@
     if (version_id <= 5)
     {
-        rc = SSMR3GetU32(f, &u32);
+        rc = SSMR3GetU32(pSSM, &u32);
         if (RT_FAILURE(rc))
             return rc;
         for (i = 0; i < u32; i++)
         {
-            rc = SSMR3GetU8(f, &u8Dummy);
+            rc = SSMR3GetU8(pSSM, &u8Dummy);
             if (RT_FAILURE(rc))
                 return rc;
@@ -1203,5 +1200,5 @@
 
 #ifndef VBOX_WITH_NEW_PS2M
-    rc = SSMR3GetU32(f, &u32);
+    rc = SSMR3GetU32(pSSM, &u32);
     if (RT_FAILURE(rc))
         return rc;
@@ -1213,5 +1210,5 @@
     for (i = 0; i < u32; i++)
     {
-        rc = SSMR3GetU8(f, &s->mouse_command_queue.data[i]);
+        rc = SSMR3GetU8(pSSM, &s->mouse_command_queue.data[i]);
         if (RT_FAILURE(rc))
             return rc;
@@ -1221,5 +1218,5 @@
     Log(("kbd_load: %d mouse command queue items loaded\n", u32));
 
-    rc = SSMR3GetU32(f, &u32);
+    rc = SSMR3GetU32(pSSM, &u32);
     if (RT_FAILURE(rc))
         return rc;
@@ -1231,5 +1228,5 @@
     for (i = 0; i < u32; i++)
     {
-        rc = SSMR3GetU8(f, &s->mouse_event_queue.data[i]);
+        rc = SSMR3GetU8(pSSM, &s->mouse_event_queue.data[i]);
         if (RT_FAILURE(rc))
             return rc;
@@ -1241,10 +1238,10 @@
     if (version_id <= 6)
     {
-        rc = SSMR3GetU32(f, &u32);
+        rc = SSMR3GetU32(pSSM, &u32);
         if (RT_FAILURE(rc))
             return rc;
         for (i = 0; i < u32; i++)
         {
-            rc = SSMR3GetU8(f, &u8Dummy);
+            rc = SSMR3GetU8(pSSM, &u8Dummy);
             if (RT_FAILURE(rc))
                 return rc;
@@ -1255,5 +1252,5 @@
 
     /* terminator */
-    rc = SSMR3GetU32(f, &u32);
+    rc = SSMR3GetU32(pSSM, &u32);
     if (RT_FAILURE(rc))
         return rc;