Changeset 37191 in vbox for trunk/src/VBox

Timestamp:

May 24, 2011 5:47:47 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: takes alignment into account, when restoring v1 snapshots. (xTracker/5704)

File:

• trunk/src/VBox/Devices/Audio/DevCodec.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DevCodec.cpp

@@ -1836 +1836 @@
 }
 
-static DECLCALLBACK(int)codecLoadV1(PCODECState pCodecState, PSSMHANDLE pSSMHandle, size_t cbOffset)
-{
-    size_t cbRawNodesV1 = (sizeof(CODECNODE) + cbOffset) * pCodecState->cTotalNodes;
+static DECLCALLBACK(int)codecLoadV1(PCODECState pCodecState, PSSMHANDLE pSSMHandle, size_t cbOffset, size_t alignment)
+{
+    size_t cbRawNodesV1 = (sizeof(CODECNODE) + cbOffset + alignment) * pCodecState->cTotalNodes;
     uint8_t *pu8RawNodesV1 = (uint8_t *)RTMemAlloc(cbRawNodesV1);
     uint8_t *pu8NodeV1 = NULL;
@@ -1856 +1856 @@
         pCodecState->pNodes[idxNode].node.id = pu8NodeV1[0];
         memcpy(pCodecState->pNodes[idxNode].node.au32F00_param,
-               pu8NodeV1 + RT_OFFSETOF(CODECCOMMONNODE, au32F00_param),
+               pu8NodeV1 + RT_OFFSETOF(CODECCOMMONNODE, au32F00_param) + alignment,
                sizeof(CODECNODE) - RT_OFFSETOF(CODECCOMMONNODE,au32F00_param));
         pu8NodeV1 += sizeof(CODECNODE) + cbOffset;
@@ -1872 +1872 @@
 #if RT_ARCH_X86
         if (SSMR3HandleHostBits(pSSMHandle) == 32)
-            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(long));
+            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(long), 0);
         else
-            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(uint64_t));
+            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(uint64_t), 4);
 #else
         if (SSMR3HandleHostBits(pSSMHandle) == 64)
-            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(long));
+            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(long), 4);
         else
-            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(uint32_t));
+            rc = codecLoadV1(pCodecState, pSSMHandle, sizeof(uint32_t), 0);
 #endif
     }