Changeset 57064 in vbox

Timestamp:

Jul 23, 2015 4:22:04 PM (10 years ago)

Author:

vboxsync

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

101786

Message:

Frontends/VBoxManage+Storage/VMDK: introduce support for creating raw partition VMDK images with readonly partitions (indicated by a 'r' suffix after the partition number)

Location:

trunk

Files:

• include/VBox/vd.h (modified) (4 diffs)
• src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (5 diffs)
• src/VBox/Storage/VMDK.cpp (modified) (7 diffs)

trunk/include/VBox/vd.h

@@ -127 +127 @@
 /** @} */
 
+/** @name VBox raw disk or partition flags
+ * @{
+ */
+/** No special treatment. */
+#define VBOXHDDRAW_NORMAL       0
+/** Whether this is a raw disk (where the partition information is ignored) or
+ * not. Valid only in the raw disk descriptor. */
+#define VBOXHDDRAW_DISK         RT_BIT(0)
+/** Open the corresponding raw disk or partition for reading only, no matter
+ * how the image is created or opened. */
+#define VBOXHDDRAW_READONLY     RT_BIT(1)
+/** @} */
+
 /**
  * Auxiliary type for describing partitions on raw disks. The entries must be
@@ -150 +163 @@
     /** Size of the data area. */
     uint64_t        cbData;
+    /** Flags for special treatment, see VBOXHDDRAW_FLAGS_*. */
+    uint32_t        uFlags;
 } VBOXHDDRAWPARTDESC, *PVBOXHDDRAWPARTDESC;
 
@@ -170 +185 @@
      * to make logging of the comment string produce sensible results. */
     char            szSignature[4];
+    /** Flags for special treatment, see VBOXHDDRAW_FLAGS_*. */
     /** Flag whether access to full disk should be given (ignoring the
      * partition information below). */
-    bool            fRawDisk;
+    uint32_t        uFlags;
     /** Filename for the raw disk. Ignored for partitioned raw disks.
      * For Linux e.g. /dev/sda, and for Windows e.g. \\\\.\\PhysicalDisk0. */
@@ -182 +198 @@
     /** Partitioning type of the disk */
     VBOXHDDPARTTYPE uPartitioningType;
-
 } VBOXHDDRAW, *PVBOXHDDRAW;
 

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1502 +1502 @@
     if (!pszPartitions)
     {
-        RawDescriptor.fRawDisk = true;
+        RawDescriptor.uFlags = VBOXHDDRAW_DISK;
         RawDescriptor.pszRawDisk = rawdisk.c_str();
     }
     else
     {
-        RawDescriptor.fRawDisk = false;
+        RawDescriptor.uFlags = VBOXHDDRAW_NORMAL;
         RawDescriptor.pszRawDisk = NULL;
         RawDescriptor.cPartDescs = 0;
@@ -1513 +1513 @@
 
         uint32_t uPartitions = 0;
+        uint32_t uPartitionsRO = 0;
 
         const char *p = pszPartitions;
@@ -1527 +1528 @@
             uPartitions |= RT_BIT(u32);
             p = pszNext;
+            if (*p == 'r')
+            {
+                uPartitionsRO |= RT_BIT(u32);
+                p++;
+            }
             if (*p == ',')
                 p++;
@@ -1647 +1653 @@
             if (uPartitions & RT_BIT(partitions.aPartitions[i].uIndex))
             {
+                if (uPartitionsRO & RT_BIT(partitions.aPartitions[i].uIndex))
+                    pPartDesc->uFlags |= VBOXHDDRAW_READONLY;
+
                 if (fRelative)
                 {
@@ -1759 +1768 @@
 
 #ifdef DEBUG_klaus
-    if (!RawDescriptor.fRawDisk)
+    if (!(RawDescriptor.uFlags & VBOXHDDRAW_DISK))
     {
         RTPrintf("#            start         length    startoffset  partdataptr  device\n");

trunk/src/VBox/Storage/VMDK.cpp

@@ -3246 +3246 @@
                 case VMDKETYPE_HOSTED_SPARSE:
                     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
-                                      VDOpenFlagsToFileOpenFlags(uOpenFlags,
+                                      VDOpenFlagsToFileOpenFlags(uOpenFlags | (pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0,
                                                                  false /* fCreate */));
                     if (RT_FAILURE(rc))
@@ -3273 +3273 @@
                 case VMDKETYPE_FLAT:
                     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
-                                      VDOpenFlagsToFileOpenFlags(uOpenFlags,
+                                      VDOpenFlagsToFileOpenFlags(uOpenFlags | (pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0,
                                                                  false /* fCreate */));
                     if (RT_FAILURE(rc))
@@ -3365 +3365 @@
     PVMDKEXTENT pExtent;
 
-    if (pRaw->fRawDisk)
+    if (pRaw->uFlags & VBOXHDDRAW_DISK)
     {
         /* Full raw disk access. This requires setting up a descriptor
@@ -3394 +3394 @@
         pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize);
         pExtent->uSectorOffset = 0;
-        pExtent->enmAccess = VMDKACCESS_READWRITE;
+        pExtent->enmAccess = (pRaw->uFlags & VBOXHDDRAW_READONLY) ? VMDKACCESS_READONLY : VMDKACCESS_READWRITE;
         pExtent->fMetaDirty = false;
 
         /* Open flat image, the raw disk. */
         rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
-                          VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags & ~VD_OPEN_FLAGS_READONLY,
+                          VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags | (pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0,
                                                      false /* fCreate */));
         if (RT_FAILURE(rc))
@@ -3507 +3507 @@
                 /* Create partition table flat image. */
                 rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
-                                  VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags,
+                                  VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags | (pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0,
                                                              true /* fCreate */));
                 if (RT_FAILURE(rc))
@@ -3537 +3537 @@
                     pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->cbData);
                     pExtent->uSectorOffset = VMDK_BYTE2SECTOR(pPart->uStartOffset);
-                    pExtent->enmAccess = VMDKACCESS_READWRITE;
+                    pExtent->enmAccess = (pPart->uFlags & VBOXHDDRAW_READONLY) ? VMDKACCESS_READONLY : VMDKACCESS_READWRITE;
                     pExtent->fMetaDirty = false;
 
                     /* Open flat image, the raw partition. */
                     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
-                                      VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags & ~VD_OPEN_FLAGS_READONLY,
+                                      VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags | (pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0,
                                                                  false /* fCreate */));
                     if (RT_FAILURE(rc))
@@ -3574 +3574 @@
 
     rc = vmdkDescBaseSetStr(pImage, &pImage->Descriptor, "createType",
-                            pRaw->fRawDisk ?
+                            (pRaw->uFlags & VBOXHDDRAW_DISK) ?
                             "fullDevice" : "partitionedDevice");
     if (RT_FAILURE(rc))