Changeset 22480 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Aug 26, 2009 5:14:13 PM (15 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

@@ -317 +317 @@
  * @param   pDrvIns         Driver instance of the driver which registered the data unit.
  * @param   pSSM            SSM operation handle.
- * @param   u32Version      Data layout version.
- */
-static DECLCALLBACK(int) iface_hgcmLoad(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t u32Version)
+ * @param   uVersion        Data layout version.
+ * @param   uPhase          The data phase.
+ */
+static DECLCALLBACK(int) iface_hgcmLoad(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
 {
     LogFlowFunc(("Enter\n"));
 
-    if (u32Version != HGCM_SSM_VERSION)
+    if (uVersion != HGCM_SSM_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+    Assert(uPhase == SSM_PHASE_FINAL); NOREF(uPhase);
 
     return HGCMHostLoadState (pSSM);
@@ -399 +401 @@
     if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, 
+    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
                     ("Configuration error: Not possible to attach anything to this driver!\n"),
                     VERR_PDM_DRVINS_NO_ATTACH);
@@ -474 +476 @@
             LogRel(("Failed to load Shared Folders service %Rrc\n", rc));
 
-        pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL);
+
+        rc = PDMDrvHlpSSMRegisterEx(pDrvIns, HGCM_SSM_VERSION, 4096 /* bad guess */,
+                                    NULL, NULL, NULL,
+                                    NULL, iface_hgcmSave, NULL,
+                                    NULL, iface_hgcmLoad, NULL);
+        if (RT_FAILURE(rc))
+            return rc;
+
     }
 #endif /* VBOX_WITH_HGCM */
@@ -490 +499 @@
     PDM_DRVREG_VERSION,
     /* szDriverName */
-    "MainVMMDev",
+    "HGCM",
     /* pszDescription */
     "Main VMMDev driver (Main as in the API).",
@@ -518 +527 @@
     NULL,
     /* pfnDetach */
-    NULL, 
+    NULL,
     /* pfnPowerOff */
-    NULL, 
+    NULL,
     /* pfnSoftReset */
     NULL,