vbox的更動 22480 路徑 trunk/src/VBox/Devices/Input/DevPS2.cpp

時間撮記:

2009-8-26 下午05:14:13 (15 年 以前)

作者:

vboxsync

訊息:

SSM,VMM,Devices,Main,VBoxBFE: Live snapshot/migration SSM API adjustments.

檔案:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (修改) (5 筆差異)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -1428 +1428 @@
  * @param   pDevIns     The device instance.
  * @param   pSSMHandle  The handle to the saved state.
- * @param   u32Version  The data unit version number.
+ * @param   uVersion    The data unit version number.
+ * @param   uPhase      The data phase.
  */
-static DECLCALLBACK(int) kbdLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
-{
-    return kbd_load(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *), u32Version);
+static DECLCALLBACK(int) kbdLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPhase)
+{
+    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
+    return kbd_load(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *), uVersion);
 }
 
@@ -1670 +1672 @@
 }
 
+
 /**
  * @copydoc FNPDMDEVRELOCATE
@@ -1679 +1682 @@
 }
 
+
 /**
  * Destruct a device instance for a VM.
@@ -1692 +1696 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -1776 +1781 @@
             return rc;
     }
-    rc = PDMDevHlpSSMRegister(pDevIns, g_DevicePS2KeyboardMouse.szDeviceName, iInstance, PCKBD_SAVED_STATE_VERSION, sizeof(*pThis),
-                              NULL, kbdSaveExec, NULL,
-                              NULL, kbdLoadExec, NULL);
+    rc = PDMDevHlpSSMRegister(pDevIns, PCKBD_SAVED_STATE_VERSION, sizeof(*pThis), kbdSaveExec, kbdLoadExec);
     if (RT_FAILURE(rc))
         return rc;