Changeset 38562 in vbox

Timestamp:

Aug 29, 2011 7:26:32 PM (13 years ago)

Author:

vboxsync

Message:

QED: Bug fixes

File:

• trunk/src/VBox/Storage/QED.cpp (modified) (8 diffs)

trunk/src/VBox/Storage/QED.cpp

@@ -309 +309 @@
 static void qedHdrConvertFromHostEndianess(PQEDIMAGE pImage, PQedHeader pHeader)
 {
-    pHeader->u32Magic                 = RT_LE2H_U32(QED_MAGIC);
-    pHeader->u32ClusterSize           = RT_LE2H_U32(pImage->cbCluster);
-    pHeader->u32TableSize             = RT_LE2H_U32(pImage->cbTable / pImage->cbCluster);
-    pHeader->u32HeaderSize            = RT_LE2H_U32(1);
-    pHeader->u64FeatureFlags          = RT_LE2H_U64(pImage->pszBackingFilename ? QED_FEATURE_BACKING_FILE : 0);
-    pHeader->u64CompatFeatureFlags    = RT_LE2H_U64(0);
-    pHeader->u64AutoresetFeatureFlags = RT_LE2H_U64(0);
-    pHeader->u64OffL1Table            = RT_LE2H_U64(pImage->offL1Table);
-    pHeader->u64Size                  = RT_LE2H_U64(pImage->cbSize);
-    pHeader->u32OffBackingFilename    = RT_LE2H_U32(pImage->offBackingFilename);
-    pHeader->u32BackingFilenameSize   = RT_LE2H_U32(pImage->cbBackingFilename);
+    pHeader->u32Magic                 = RT_H2LE_U32(QED_MAGIC);
+    pHeader->u32ClusterSize           = RT_H2LE_U32(pImage->cbCluster);
+    pHeader->u32TableSize             = RT_H2LE_U32(pImage->cbTable / pImage->cbCluster);
+    pHeader->u32HeaderSize            = RT_H2LE_U32(1);
+    pHeader->u64FeatureFlags          = RT_H2LE_U64(pImage->pszBackingFilename ? QED_FEATURE_BACKING_FILE : 0);
+    pHeader->u64CompatFeatureFlags    = RT_H2LE_U64(0);
+    pHeader->u64AutoresetFeatureFlags = RT_H2LE_U64(0);
+    pHeader->u64OffL1Table            = RT_H2LE_U64(pImage->offL1Table);
+    pHeader->u64Size                  = RT_H2LE_U64(pImage->cbSize);
+    pHeader->u32OffBackingFilename    = RT_H2LE_U32(pImage->offBackingFilename);
+    pHeader->u32BackingFilenameSize   = RT_H2LE_U32(pImage->cbBackingFilename);
 }
 
@@ -532 +532 @@
     {
         /* Insert into search list. */
-        RTListForEach(&pImage->ListSearch, pIt, QEDL2CACHEENTRY, NodeSearch)
-        {
-            Assert(pIt->offL2Tbl != pL2Entry->offL2Tbl);
-            if (pIt->offL2Tbl < pL2Entry->offL2Tbl)
+        pIt = RTListGetFirst(&pImage->ListSearch, QEDL2CACHEENTRY, NodeSearch);
+        if (pIt->offL2Tbl > pL2Entry->offL2Tbl)
+            RTListPrepend(&pImage->ListSearch, &pL2Entry->NodeSearch);
+        else
+        {
+            bool fInserted = false;
+
+            RTListForEach(&pImage->ListSearch, pIt, QEDL2CACHEENTRY, NodeSearch)
             {
-                RTListNodeInsertAfter(&pIt->NodeSearch, &pL2Entry->NodeSearch);
-                break;
+                Assert(pIt->offL2Tbl != pL2Entry->offL2Tbl);
+                if (pIt->offL2Tbl < pL2Entry->offL2Tbl)
+                {
+                    RTListNodeInsertAfter(&pIt->NodeSearch, &pL2Entry->NodeSearch);
+                    fInserted = true;
+                    break;
+                }
             }
+             Assert(fInserted);
         }
     }
@@ -575 +585 @@
             {
 #if defined(RT_BIG_ENDIAN)
-                qedTableConvertToHostEndianness(pL2Entry->paL2Tbl, pImage->cTableEntries);
+                qedTableConvertToHostEndianess(pL2Entry->paL2Tbl, pImage->cTableEntries);
 #endif
                 qedL2TblCacheEntryInsert(pImage, pL2Entry);
             }
             else
+            {
+                qedL2TblCacheEntryRelease(pL2Entry);
                 qedL2TblCacheEntryFree(pImage, pL2Entry);
+            }
         }
         else
@@ -628 +641 @@
                 vdIfIoIntMetaXferRelease(pImage->pIfIo, pMetaXfer);
 #if defined(RT_BIG_ENDIAN)
-                qedTableConvertToHostEndianness(pL2Entry->paL2Tbl, pImage->cTableEntries);
+                qedTableConvertToHostEndianess(pL2Entry->paL2Tbl, pImage->cTableEntries);
 #endif
                 qedL2TblCacheEntryInsert(pImage, pL2Entry);
@@ -857 +870 @@
         if (paL1TblImg)
         {
-            qedTableConvertFromHostEndianess(p1L1TblImg, pImage->paL1Table,
+            qedTableConvertFromHostEndianess(paL1TblImg, pImage->paL1Table,
                                              pImage->cTableEntries);
             rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage,
@@ -906 +919 @@
         if (paL1TblImg)
         {
-            qedTableConvertFromHostEndianess(p1L1TblImg, pImage->paL1Table,
+            qedTableConvertFromHostEndianess(paL1TblImg, pImage->paL1Table,
                                              pImage->cTableEntries);
             rc = vdIfIoIntFileWriteMetaAsync(pImage->pIfIo, pImage->pStorage,
@@ -1423 +1436 @@
             qedL2TblCacheEntryRelease(pClusterAlloc->pL2Entry); /* Release L2 cache entry. */
             qedL2TblCacheEntryFree(pImage, pClusterAlloc->pL2Entry); /* Free it, it is not in the cache yet. */
+            break;
         }
         case QEDCLUSTERASYNCALLOCSTATE_USER_ALLOC:
@@ -1430 +1444 @@
             rc = vdIfIoIntFileSetSize(pImage->pIfIo, pImage->pStorage, pClusterAlloc->cbImageOld);
             qedL2TblCacheEntryRelease(pClusterAlloc->pL2Entry); /* Release L2 cache entry. */
+            break;
         }
         default: