Changeset 25050 in vbox for trunk/src/VBox/Devices/Graphics/HGSMI

Timestamp:

Nov 27, 2009 1:40:18 PM (15 years ago)

Author:

vboxsync

Message:

HGSMIHost.cpp: Did a quick cleanup of the saved state error handling before attacking the heap.

File:

• trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -93 +93 @@
 #define VBOXHGSMI_STATE_FIFOSTOP_MAGIC 0x1fedcba9
 
-#define VBOXHGSMI_SAVE_START(_pSSM) do{ int rc = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_START_MAGIC); AssertRC(rc);}while(0)
-#define VBOXHGSMI_SAVE_STOP(_pSSM) do{ int rc = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_STOP_MAGIC); AssertRC(rc);}while(0)
-#define VBOXHGSMI_SAVE_FIFOSTART(_pSSM) do{ int rc = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTART_MAGIC); AssertRC(rc);}while(0)
-#define VBOXHGSMI_SAVE_FIFOSTOP(_pSSM) do{ int rc = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTOP_MAGIC); AssertRC(rc);}while(0)
+#define VBOXHGSMI_SAVE_START(_pSSM)     do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_START_MAGIC);      AssertRC(rc2);}while(0)
+#define VBOXHGSMI_SAVE_STOP(_pSSM)      do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_STOP_MAGIC);       AssertRC(rc2);}while(0)
+#define VBOXHGSMI_SAVE_FIFOSTART(_pSSM) do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTART_MAGIC);  AssertRC(rc2);}while(0)
+#define VBOXHGSMI_SAVE_FIFOSTOP(_pSSM)  do{ int rc2 = SSMR3PutU32(_pSSM, VBOXHGSMI_STATE_FIFOSTOP_MAGIC);   AssertRC(rc2);}while(0)
 
 #define VBOXHGSMI_LOAD_CHECK(_pSSM, _v) \
     do{ \
         uint32_t u32; \
-        int rc = SSMR3GetU32(_pSSM, &u32); AssertRC(rc); \
+        int rc2 = SSMR3GetU32(_pSSM, &u32); AssertRC(rc2); \
         Assert(u32 == (_v)); \
     }while(0)
@@ -1086 +1086 @@
 static int hgsmiHostSaveFifoEntryLocked (HGSMIHOSTFIFOENTRY *pEntry, PSSMHANDLE pSSM)
 {
-    int rc = SSMR3PutU32 (pSSM, pEntry->fl); AssertRC(rc);
-    rc = SSMR3PutU32 (pSSM, pEntry->offBuffer); AssertRC(rc);
-    return rc;
+    SSMR3PutU32 (pSSM, pEntry->fl);
+    return SSMR3PutU32 (pSSM, pEntry->offBuffer);
 }
 
@@ -1099 +1098 @@
         ++size;
     }
-    int rc = SSMR3PutU32 (pSSM, size); AssertRC(rc);
-
-    for(HGSMILISTENTRY * pEntry = pFifo->pHead; pEntry; pEntry = pEntry->pNext)
+    int rc = SSMR3PutU32 (pSSM, size);
+
+    for(HGSMILISTENTRY * pEntry = pFifo->pHead; pEntry && RT_SUCCESS(rc); pEntry = pEntry->pNext)
     {
         HGSMIHOSTFIFOENTRY *pFifoEntry = HGSMILISTENTRY_2_FIFOENTRY(pEntry);
-        rc = hgsmiHostSaveFifoEntryLocked (pFifoEntry, pSSM);  AssertRC(rc);
+        rc = hgsmiHostSaveFifoEntryLocked (pFifoEntry, pSSM);
     }
 
@@ -1123 +1122 @@
         pEntry->fl = u32;
         rc = SSMR3GetU32 (pSSM, &pEntry->offBuffer); AssertRC(rc);
-        *ppEntry = pEntry;
+        if (RT_SUCCESS (rc))
+            *ppEntry = pEntry;
+        else
+            hgsmiHostFIFOFree (pIns, pEntry);
     }
 
@@ -1140 +1142 @@
         {
             HGSMIHOSTFIFOENTRY *pFifoEntry = NULL;  /* initialized to shut up gcc */
-            rc = hgsmiHostLoadFifoEntryLocked (pIns, &pFifoEntry, pSSM); AssertRC(rc);
-            if (RT_SUCCESS (rc))
-            {
-                hgsmiListAppend (pFifo, &pFifoEntry->entry);
-            }
+            rc = hgsmiHostLoadFifoEntryLocked (pIns, &pFifoEntry, pSSM);
+            AssertRCBreak(rc);
+            hgsmiListAppend (pFifo, &pFifoEntry->entry);
         }
     }
@@ -1161 +1161 @@
 
     HGSMIOFFSET off = pIns->pHGFlags ? HGSMIPointerToOffset(&pIns->area, (const HGSMIBUFFERHEADER *)pIns->pHGFlags) : HGSMIOFFSET_VOID;
-    rc = SSMR3PutU32 (pSSM, off); AssertRC(rc);
+    SSMR3PutU32 (pSSM, off);
 
     off = HGSMIHeapHandleLocationOffset(&pIns->hostHeap);
-    rc = SSMR3PutU32 (pSSM, off); AssertRC(rc);
+    rc = SSMR3PutU32 (pSSM, off);
     if(off != HGSMIOFFSET_VOID)
     {
-        rc = SSMR3PutU32 (pSSM, HGSMIHeapOffset(&pIns->hostHeap)); AssertRC(rc);
-        rc = SSMR3PutU32(pSSM, HGSMIHeapSize(&pIns->hostHeap)); AssertRC(rc);
+        SSMR3PutU32 (pSSM, HGSMIHeapOffset(&pIns->hostHeap));
+        SSMR3PutU32 (pSSM, HGSMIHeapSize(&pIns->hostHeap));
         /* need save mem pointer to calculate offset on restore */
-        rc = SSMR3PutU64 (pSSM, (uint64_t)pIns->area.pu8Base); AssertRC(rc);
-        rc = hgsmiFIFOLock (pIns); AssertRC(rc);
+        SSMR3PutU64 (pSSM, (uint64_t)pIns->area.pu8Base);
+        rc = hgsmiFIFOLock (pIns);
         if(RT_SUCCESS(rc))
         {
@@ -1196 +1196 @@
     int rc;
     HGSMIOFFSET off;
-    rc = SSMR3GetU32(pSSM, &off); AssertRC(rc);
+    rc = SSMR3GetU32(pSSM, &off);
+    AssertRCReturn(rc, rc);
     pIns->pHGFlags = (off != HGSMIOFFSET_VOID) ? (HGSMIHOSTFLAGS*)HGSMIOffsetToPointer (&pIns->area, off) : NULL;
 
     HGSMIHEAP hHeap = pIns->hostHeap;
-    rc = SSMR3GetU32(pSSM, &off); AssertRC(rc);
+    rc = SSMR3GetU32(pSSM, &off);
+    AssertRCReturn(rc, rc);
     if(off != HGSMIOFFSET_VOID)
     {
         HGSMIOFFSET offHeap;
+        SSMR3GetU32(pSSM, &offHeap);
         uint32_t cbHeap;
-        rc = SSMR3GetU32(pSSM, &offHeap); AssertRC(rc);
-        rc = SSMR3GetU32(pSSM, &cbHeap); AssertRC(rc);
+        SSMR3GetU32(pSSM, &cbHeap);
         uint64_t oldMem;
-        rc = SSMR3GetU64(pSSM, &oldMem); AssertRC(rc);
-
-        rc = hgsmiHostHeapLock (pIns); AssertRC(rc);
+        rc = SSMR3GetU64(pSSM, &oldMem);
+        AssertRCReturn(rc, rc);
+
+        rc = hgsmiHostHeapLock (pIns);
         if (RT_SUCCESS (rc))
         {
@@ -1225 +1228 @@
         }
 
-
-        rc = hgsmiFIFOLock (pIns); AssertRC(rc);
-        if(RT_SUCCESS(rc))
-        {
-            rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFO, pSSM); AssertRC(rc);
-            rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFORead, pSSM); AssertRC(rc);
-            rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM); AssertRC(rc);
-
-            hgsmiFIFOUnlock (pIns);
+        if (RT_SUCCESS(rc))
+        {
+            rc = hgsmiFIFOLock (pIns);
+            if(RT_SUCCESS(rc))
+            {
+                rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFO, pSSM);
+                if (RT_SUCCESS(rc))
+                    rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFORead, pSSM);
+                if (RT_SUCCESS(rc))
+                    rc = hgsmiHostLoadFifoLocked (pIns, &pIns->hostFIFOProcessed, pSSM);
+
+                hgsmiFIFOUnlock (pIns);
+            }
         }
     }