Changeset 22480 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51500

Message:

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

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -116 +116 @@
  */
 DECLCALLBACK(void)
-Display::displaySSMSave (PSSMHANDLE pSSM, void *pvUser)
+Display::displaySSMSave(PSSMHANDLE pSSM, void *pvUser)
 {
     Display *that = static_cast<Display*>(pvUser);
 
-    int rc = SSMR3PutU32 (pSSM, that->mcMonitors);
-    AssertRC(rc);
-
+    SSMR3PutU32(pSSM, that->mcMonitors);
     for (unsigned i = 0; i < that->mcMonitors; i++)
     {
-        rc = SSMR3PutU32 (pSSM, that->maFramebuffers[i].u32Offset);
-        AssertRC(rc);
-        rc = SSMR3PutU32 (pSSM, that->maFramebuffers[i].u32MaxFramebufferSize);
-        AssertRC(rc);
-        rc = SSMR3PutU32 (pSSM, that->maFramebuffers[i].u32InformationSize);
-        AssertRC(rc);
+        SSMR3PutU32(pSSM, that->maFramebuffers[i].u32Offset);
+        SSMR3PutU32(pSSM, that->maFramebuffers[i].u32MaxFramebufferSize);
+        SSMR3PutU32(pSSM, that->maFramebuffers[i].u32InformationSize);
     }
 }
 
 DECLCALLBACK(int)
-Display::displaySSMLoad (PSSMHANDLE pSSM, void *pvUser, uint32_t u32Version)
+Display::displaySSMLoad(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPhase)
 {
     Display *that = static_cast<Display*>(pvUser);
+
+    if (uVersion != sSSMDisplayVer)
+        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+
     uint32_t cMonitors;
-
-    if (u32Version != sSSMDisplayVer)
-        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
-
-    int rc = SSMR3GetU32 (pSSM, &cMonitors);
+    int rc = SSMR3GetU32(pSSM, &cMonitors);
     if (cMonitors != that->mcMonitors)
     {
         LogRel(("Display: Number of monitors changed (%d->%d)!\n",
-                 cMonitors, that->mcMonitors));
+                cMonitors, that->mcMonitors));
         return VERR_SSM_LOAD_CONFIG_MISMATCH;
     }
 
-    for (unsigned i = 0; i < cMonitors; i++)
-    {
-        rc = SSMR3GetU32 (pSSM, &that->maFramebuffers[i].u32Offset);
-        AssertRC(rc);
-        rc = SSMR3GetU32 (pSSM, &that->maFramebuffers[i].u32MaxFramebufferSize);
-        AssertRC(rc);
-        rc = SSMR3GetU32 (pSSM, &that->maFramebuffers[i].u32InformationSize);
-        AssertRC(rc);
+    for (uint32_t i = 0; i < cMonitors; i++)
+    {
+        SSMR3GetU32(pSSM, &that->maFramebuffers[i].u32Offset);
+        SSMR3GetU32(pSSM, &that->maFramebuffers[i].u32MaxFramebufferSize);
+        SSMR3GetU32(pSSM, &that->maFramebuffers[i].u32InformationSize);
     }
 
@@ -262 +254 @@
 int Display::registerSSM(PVM pVM)
 {
-    return SSMR3RegisterExternal(pVM, "DisplayData", 3*sizeof(uint32_t*),
-                                 sSSMDisplayVer, 0,
-                                 NULL, displaySSMSave, NULL,
-                                 NULL, displaySSMLoad, NULL, this);
+    int rc = SSMR3RegisterExternal(pVM, "DisplayData", 0, sSSMDisplayVer,
+                                   mcMonitors * sizeof(uint32_t) * 3 + sizeof(uint32_t),
+                                   NULL, NULL, NULL,
+                                   NULL, displaySSMSave, NULL,
+                                   NULL, displaySSMLoad, NULL, this);
+
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Register loaders for old saved states where iInstance was 3 * sizeof(uint32_t *).
+     */
+    rc = SSMR3RegisterExternal(pVM, "DisplayData", 12 /*uInstance*/, sSSMDisplayVer, 0 /*cbGuess*/,
+                               NULL, NULL, NULL,
+                               NULL, NULL, NULL,
+                               NULL, displaySSMLoad, NULL, this);
+    AssertRCReturn(rc, rc);
+
+    rc = SSMR3RegisterExternal(pVM, "DisplayData", 24 /*uInstance*/, sSSMDisplayVer, 0 /*cbGuess*/,
+                               NULL, NULL, NULL,
+                               NULL, NULL, NULL,
+                               NULL, displaySSMLoad, NULL, this);
+    AssertRCReturn(rc, rc);
+    return VINF_SUCCESS;
 }
 
@@ -2393 +2404 @@
 
     pThis->maFramebuffers[uScreenId].fVBVAEnabled = true;
-    
+
     return VINF_SUCCESS;
 }
@@ -2547 +2558 @@
     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);
@@ -2657 +2668 @@
     NULL,
     /* pfnDetach */
-    NULL, 
+    NULL,
     /* pfnPowerOff */
-    NULL, 
+    NULL,
     /* pfnSoftReset */
     NULL,