Changeset 44139 in vbox for trunk

Timestamp:

Dec 15, 2012 4:03:59 PM (12 years ago)

Author:

vboxsync

Message:

Storage/VHD: Pad sector bitmaps to a 512 byte boundary as required by the spec, fixes problems with newer VHD images when appending a new data block

File:

• trunk/src/VBox/Storage/VHD.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VHD.cpp

@@ -2484 +2484 @@
                                                  pImage->uCurrentEndOfFile,
                                                  pExpand->au8Bitmap,
-                                                 pImage->cbDataBlockBitmap, pIoCtx,
+                                                 pImage->cDataBlockBitmapSectors * VHD_SECTOR_SIZE, pIoCtx,
                                                  vhdAsyncExpansionDataBlockBitmapComplete,
                                                  pExpand);
@@ -2505 +2505 @@
                  */
                 rc = vdIfIoIntFileWriteUserAsync(pImage->pIfIo, pImage->pStorage,
-                                                 pImage->uCurrentEndOfFile + pImage->cbDataBlockBitmap,
+                                                 pImage->uCurrentEndOfFile + pImage->cDataBlockBitmapSectors * VHD_SECTOR_SIZE,
                                                  pIoCtx, cbWrite,
                                                  vhdAsyncExpansionDataComplete,
@@ -2545 +2545 @@
                  */
                 pImage->pBlockAllocationTable[cBlockAllocationTableEntry] = pImage->uCurrentEndOfFile / VHD_SECTOR_SIZE;
-                pImage->uCurrentEndOfFile += pImage->cbDataBlockBitmap + pImage->cbDataBlock;
+                pImage->uCurrentEndOfFile += pImage->cDataBlockBitmapSectors * VHD_SECTOR_SIZE + pImage->cbDataBlock;
 
                 /* Update the footer. */