Changeset 80512 in vbox

Timestamp:

Aug 30, 2019 11:40:05 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133013

Message:

vboximg-mounter: Don't hardcode the sector size but use VDGetSectorSize() to query it from the disk image

File:

• trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp (modified) (14 diffs)

trunk/src/VBox/ImageMounter/vboximg-mount/vboximg-mount.cpp

@@ -91 +91 @@
 
 #define VBOX_EXTPACK                "Oracle VM VirtualBox Extension Pack"
-#define GPT_PTABLE_SIZE             32 * BLOCKSIZE   /** Max size we to read for GPT partition table */
+#define GPT_PTABLE_SIZE             32 * 512         /** Max size we to read for GPT partition table */
 #define MBR_PARTITIONS_MAX          4                /** Fixed number of partitions in Master Boot Record */
 #define BASENAME_MAX                256              /** Maximum name for the basename of a path (for RTStrNLen()*/
 #define VBOXIMG_PARTITION_MAX       256              /** How much storage to allocate to store partition info */
 #define PARTITION_NAME_MAX          72               /** Maximum partition name size (accomodates GPT partition name) */
-#define BLOCKSIZE                   512              /** Commonly used disk block size */
 #define DOS_BOOT_RECORD_SIGNATURE   0xaa55           /** MBR and EBR (partition table) signature [EOT boundary] */
 #define NULL_BOOT_RECORD_SIGNATURE  0x0000           /** MBR or EBR null signature value */
 #define MAX_UUID_LEN                256              /** Max length of a UUID */
-#define LBA(n)                      (n * BLOCKSIZE)
-#define VD_SECTOR_SIZE              512              /** Virtual disk sector/blocksize */
-#define VD_SECTOR_MASK              (VD_SECTOR_SIZE - 1)    /** Masks off a blocks worth of data */
-#define VD_SECTOR_OUT_OF_BOUNDS_MASK  (~UINT64_C(VD_SECTOR_MASK))         /** Masks the overflow of a blocks worth of data */
+#define LBA(n)                      (n * g_cbSector)
 #define VERBOSE                     g_vboximgOpts.fVerbose
-#define IS_BIG_ENDIAN (*(uint16_t *)"\0\xff" < 0x100)
 
 #define PARTTYPE_IS_NULL(parType) ((uint8_t)parType == 0x00)
@@ -121 +116 @@
 
 static RTVFSFILE             g_hVfsFileDisk;        /** Disk as VFS file handle. */
-static char                 *g_pszDiskUuid;          /** UUID of image (if known, otherwise NULL) */
+static uint32_t              g_cbSector;            /** Disk sector size. */
+static char                 *g_pszDiskUuid;         /** UUID of image (if known, otherwise NULL) */
 static off_t                 g_vDiskOffset;         /** Biases r/w from start of VD */
 static off_t                 g_vDiskSize;           /** Limits r/w length for VD */
@@ -642 +638 @@
 
         ppi->idxPartition = idxPartition;
-        ppi->offPartition = (off_t) pMbrPartitionEntry->partitionLba * BLOCKSIZE;
-        ppi->cbPartition  = (off_t) pMbrPartitionEntry->partitionBlkCnt * BLOCKSIZE;
+        ppi->offPartition = (off_t) pMbrPartitionEntry->partitionLba * g_cbSector;
+        ppi->cbPartition  = (off_t) pMbrPartitionEntry->partitionBlkCnt * g_cbSector;
         ppi->fBootable    = pMbrPartitionEntry->bootIndicator == 0x80;
         ppi->partitionType.legacy = pMbrPartitionEntry->type;
@@ -689 +685 @@
             if (!pEntry->firstLba)
                 break;
-            ppi->offPartition = pEntry->firstLba * BLOCKSIZE;
-            ppi->cbPartition = (pEntry->lastLba - pEntry->firstLba) * BLOCKSIZE;
+            ppi->offPartition = pEntry->firstLba * g_cbSector;
+            ppi->cbPartition = (pEntry->lastLba - pEntry->firstLba) * g_cbSector;
             ppi->fBootable = pEntry->attrFlags & (1 << GPT_LEGACY_BIOS_BOOTABLE);
             ppi->partitionType.gptGuidTypeSpecifier = pEntry->partitionTypeGuid;
@@ -708 +704 @@
         uint32_t firstEbrLba
             = g_aParsedPartitionInfo[idxEbrPartitionInMbr].partitionEntry.mbrEntry.partitionLba;
-        off_t    firstEbrOffset   = (off_t)firstEbrLba * BLOCKSIZE;
+        off_t    firstEbrOffset   = (off_t)firstEbrLba * g_cbSector;
         off_t    chainedEbrOffset = 0;
 
@@ -738 +734 @@
             PARTITIONINFO *ppi = &g_aParsedPartitionInfo[idxPartition];
             ppi->idxPartition         = idxPartition;
-            ppi->offPartition         = currentEbrOffset + (off_t)pEbrPartitionEntry->partitionLba * BLOCKSIZE;
-            ppi->cbPartition          = (off_t)pEbrPartitionEntry->partitionBlkCnt * BLOCKSIZE;
+            ppi->offPartition         = currentEbrOffset + (off_t)pEbrPartitionEntry->partitionLba * g_cbSector;
+            ppi->cbPartition          = (off_t)pEbrPartitionEntry->partitionBlkCnt * g_cbSector;
             ppi->fBootable            = pEbrPartitionEntry->bootIndicator == 0x80;
             ppi->partitionType.legacy = pEbrPartitionEntry->type;
@@ -751 +747 @@
                 return RTMsgErrorExitFailure("Logical partition chain broken");
 
-            chainedEbrOffset = ebr.chainingPartitionEntry.partitionLba * BLOCKSIZE;
+            chainedEbrOffset = ebr.chainingPartitionEntry.partitionLba * g_cbSector;
         }
     }
@@ -825 +821 @@
             if (colBoot)
                 tbl.setCell(row, colBoot,   ppi->fBootable ? '*' : ' ');
-            tbl.setCell(row, colStart,      ppi->offPartition / BLOCKSIZE);
-            tbl.setCell(row, colSectors,    ppi->cbPartition / BLOCKSIZE);
+            tbl.setCell(row, colStart,      ppi->offPartition / g_cbSector);
+            tbl.setCell(row, colSectors,    ppi->cbPartition / g_cbSector);
             tbl.setCell(row, colSize,       vboximgScaledSize(ppi->cbPartition));
             tbl.setCell(row, colOffset,     ppi->offPartition);
@@ -875 +871 @@
             tbl.setCell(row, colPartition,  g_pszBaseImageName, idxPartition);
             tbl.setCell(row, colBoot,       p->fBootable ? '*' : ' ');
-            tbl.setCell(row, colStart,      p->offPartition / BLOCKSIZE);
-            tbl.setCell(row, colSectors,    p->cbPartition / BLOCKSIZE);
+            tbl.setCell(row, colStart,      p->offPartition / g_cbSector);
+            tbl.setCell(row, colSectors,    p->cbPartition / g_cbSector);
             tbl.setCell(row, colSize,       vboximgScaledSize(p->cbPartition));
             tbl.setCell(row, colOffset,     p->offPartition);
@@ -1232 +1228 @@
 
         rc = VDOpen(pVDisk,
-                    CSTR(pszFormat),
+                    pszFormat,
                     CSTR(pCurMedium->pImagePath),
                     pCurMedium->fWriteable,
@@ -1256 +1252 @@
     if (RT_FAILURE(rc))
         return RTMsgErrorExitFailure("Error querying disk image size from VFS wrapper\n");
+
+    g_cbSector = VDGetSectorSize(pVDisk, VD_LAST_IMAGE);
 
     if (g_vboximgOpts.fList)
@@ -1318 +1316 @@
                      if (VERBOSE)
                         RTPrintf("\nPartition %d specified. Only sectors %llu to %llu of disk will be accessible\n",
-                            g_vboximgOpts.idxPartition, g_vDiskOffset / BLOCKSIZE, g_vDiskSize / BLOCKSIZE);
+                            g_vboximgOpts.idxPartition, g_vDiskOffset / g_cbSector, g_vDiskSize / g_cbSector);
                 }
             }
@@ -1330 +1328 @@
 
             if (VERBOSE)
-                RTPrintf("Setting r/w bias (offset) to user requested value for sector %llu\n", g_vDiskOffset / BLOCKSIZE);
+                RTPrintf("Setting r/w bias (offset) to user requested value for sector %llu\n", g_vDiskOffset / g_cbSector);
 
             g_vDiskOffset = g_vboximgOpts.offset;
@@ -1339 +1337 @@
 
             if (VERBOSE)
-                RTPrintf("Setting r/w size limit to user requested value %llu\n", g_vDiskSize / BLOCKSIZE);
+                RTPrintf("Setting r/w size limit to user requested value %llu\n", g_vDiskSize / g_cbSector);
 
             g_vDiskSize = g_vboximgOpts.size;