Changeset 34141 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 17, 2010 5:06:11 PM (14 years ago)

Author:

vboxsync

Message:

2d: solaris burn fix, additianal saved state fix

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -60 +60 @@
 
 #define VBOXQGL_STATE_NAMEBASE "QGLVHWAData"
-#define VBOXQGL_STATE_VERSION 2
+#define VBOXQGL_STATE_VERSION           3
+#define VBOXQGL_STATE_VERSION_PIPESAVED 3
 
 #ifdef DEBUG
@@ -4776 +4777 @@
     if (RT_SUCCESS(rc))
     {
-        rc = mCmdPipe.loadExec(pSSM, u32Version, mOverlayImage.vramBase());
-        AssertRC(rc);
+        if (u32Version >= VBOXQGL_STATE_VERSION_PIPESAVED)
+        {
+            rc = mCmdPipe.loadExec(pSSM, u32Version, mOverlayImage.vramBase());
+            AssertRC(rc);
+        }
     }
     return rc;
@@ -5199 +5203 @@
     bool b;
     int rc;
-    rc = SSMR3GetU32(pSSM, &u32);
+    rc = SSMR3GetU32(pSSM, &u32); AssertRC(rc);
     if (RT_SUCCESS(rc))
     {
@@ -5265 +5269 @@
         }
     }
-    else if (rc == VERR_SSM_LOADED_TOO_MUCH)
-    {
-        /* this would mean we do not have a cmd pipe data saved.
-         * skip the failure.
-         * not sure if that's a good idea actually,
-         * but this allows keeping the state version unchanged */
-        rc = VINF_SUCCESS;
-    }
 
     return rc;