Changeset 2718 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

May 18, 2007 3:07:58 PM (18 years ago)

Author:

vboxsync

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

21314

Message:

Implemented raw partition access.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxHDD-new.cpp (modified) (2 diffs)
• VmdkHDDCore.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -505 +505 @@
                           pszBackend);
 
-    LogFlow(("%s: returns %vrc (pDisk=%#p)\n", __FUNCTION__, rc, pDisk));
+    LogFlow(("%s: returns %Vrc (pDisk=%#p)\n", __FUNCTION__, rc, pDisk));
     return rc;
 }
@@ -1033 +1033 @@
 {
     /* sanity check */
+    LogFlow(("%s: offset=%llu cbRead=%u\n", __FUNCTION__, uOffset, (unsigned)cbRead));
     Assert(pDisk);
     AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -547 +547 @@
 static void vmdkFreeGrainDirectory(PVMDKEXTENT pExtent)
 {
-    if (pExtent->pszBasename)
-    {
-        RTMemTmpFree((void *)pExtent->pszBasename);
-        pExtent->pszBasename = NULL;
-    }
     if (pExtent->pGD)
     {
@@ -1573 +1568 @@
             RTFileDelete(pExtent->pszFullname);
     }
+    if (pExtent->pszBasename)
+    {
+        RTMemTmpFree((void *)pExtent->pszBasename);
+        pExtent->pszBasename = NULL;
+    }
     if (pExtent->pszFullname)
     {
@@ -1761 +1761 @@
                  * extent descriptor is absolute. Doesn't always work, but
                  * should be good enough for now. */
+                char *pszFullname;
                 /** @todo implement proper path absolute check. */
                 if (pExtent->pszBasename[0] == RTPATH_SLASH)
                 {
-                    pszFilename = RTStrDup(pExtent->pszBasename);
-                    if (!pszFilename)
+                    pszFullname = RTStrDup(pExtent->pszBasename);
+                    if (!pszFullname)
                     {
                         rc = VERR_NO_MEMORY;
@@ -1782 +1783 @@
                     RTPathStripFilename(pszDirname);
                     cbDirname = strlen(pszDirname);
-                    char *pszFullname;
                     rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
                                       RTPATH_SLASH, pExtent->pszBasename);
@@ -1788 +1788 @@
                     if (VBOX_FAILURE(rc))
                         goto out;
-                    pExtent->pszFullname = pszFullname;
                 }
+                pExtent->pszFullname = pszFullname;
             }
             else
@@ -1956 +1956 @@
                 pExtent->uSectorOffset = 0;
                 pExtent->enmAccess = VMDKACCESS_READWRITE;
-                pExtent->fMetaDirty = true;
+                pExtent->fMetaDirty = false;
 
                 pImage->enmImageType = enmType;
@@ -1977 +1977 @@
             else
             {
-                /******* fixme. */
-                rc = VERR_NOT_IMPLEMENTED;
-                goto out;
+                /* Raw partition access. This requires setting up a descriptor
+                 * file, write the partition information to a flat extent and
+                 * open all the (flat) raw disk partitions. */
+
+                /* First pass over the partitions to determine how many
+                 * extents we need. One partition can require up to 4 extents.
+                 * One to skip over unpartitioned space, one for the
+                 * partitioning data, one to skip over unpartitioned space
+                 * and one for the partition data. */
+                unsigned cExtents = 0;
+                uint64_t uStart = 0;
+                for (unsigned i = 0; i < pRaw->cPartitions; i++)
+                {
+                    PVBOXHDDRAWPART pPart = &pRaw->pPartitions[i];
+                    if (pPart->cbPartitionData)
+                    {
+                        if (uStart > pPart->uPartitionDataStart)
+                        {
+                            rc = vmdkError(pImage, VERR_INVALID_PARAMETER, RT_SRC_POS, N_("VMDK: cannot go backwards for partitioning information in '%s'"), pszFilename);
+                            goto out;
+                        } else if (uStart != pPart->uPartitionDataStart)
+                            cExtents++;
+                        uStart = pPart->uPartitionDataStart + pPart->cbPartitionData;
+                        cExtents++;
+                    }
+                    if (pPart->cbPartition)
+                    {
+                        if (uStart > pPart->uPartitionStart)
+                        {
+                            rc = vmdkError(pImage, VERR_INVALID_PARAMETER, RT_SRC_POS, N_("VMDK: cannot go backwards for partition data in '%s'"), pszFilename);
+                            goto out;
+                        } else if (uStart != pPart->uPartitionStart)
+                            cExtents++;
+                        uStart = pPart->uPartitionStart + pPart->cbPartition;
+                        cExtents++;
+                    }
+                }
+                /* Another extent for filling up the rest of the image. */
+                if (uStart != cbSize)
+                    cExtents++;
+
+                rc = vmdkCreateExtents(pImage, cExtents);
+                if (VBOX_FAILURE(rc))
+                {
+                    rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pszFilename);
+                    goto out;
+                }
+
+                rc = RTFileOpen(&pImage->File, pszFilename,
+                                RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE);
+                if (VBOX_FAILURE(rc))
+                {
+                    rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pszFilename);
+                    goto out;
+                }
+
+                /* Create base filename for the partition table extent. */
+                /** @todo remove fixed buffer. */
+                char pszPartition[1024];
+                const char *pszBase = RTPathFilename(pszFilename);
+                const char *pszExt = RTPathExt(pszBase);
+                if (pszExt == NULL)
+                {
+                    rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: invalid filename '%s'"), pszFilename);
+                    goto out;
+                }
+                memcpy(pszPartition, pszBase, pszExt - pszBase);
+                memcpy(pszPartition + (pszExt - pszBase), "-pt", 3);
+                memcpy(pszPartition + (pszExt - pszBase) + 3, pszExt, strlen(pszExt) + 1);
+
+                /* Second pass over the partitions, now define all extents. */
+                uint64_t uPartOffset = 0;
+                cExtents = 0;
+                uStart = 0;
+                for (unsigned i = 0; i < pRaw->cPartitions; i++)
+                {
+                    PVBOXHDDRAWPART pPart = &pRaw->pPartitions[i];
+                    if (pPart->cbPartitionData)
+                    {
+                        if (uStart != pPart->uPartitionDataStart)
+                        {
+                            pExtent = &pImage->pExtents[cExtents++];
+                            pExtent->pszBasename = NULL;
+                            pExtent->pszFullname = NULL;
+                            pExtent->enmType = VMDKETYPE_ZERO;
+                            pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->uPartitionDataStart - uStart);
+                            pExtent->uSectorOffset = 0;
+                            pExtent->enmAccess = VMDKACCESS_READWRITE;
+                            pExtent->fMetaDirty = false;
+                        }
+                        uStart = pPart->uPartitionDataStart + pPart->cbPartitionData;
+                        pExtent = &pImage->pExtents[cExtents++];
+                        /* Set up basename for extent description. Cannot use StrDup. */
+                        size_t cbBasename = strlen(pszPartition) + 1;
+                        char *pszBasename = (char *)RTMemTmpAlloc(cbBasename);
+                        if (!pszBasename)
+                        {
+                            rc = VERR_NO_MEMORY;
+                            goto out;
+                        }
+                        memcpy(pszBasename, pszPartition, cbBasename);
+                        pExtent->pszBasename = pszBasename;
+
+                        /* Set up full name for partition extent. */
+                        size_t cbDirname;
+                        char *pszDirname = RTStrDup(pImage->pszFilename);
+                        if (!pszDirname)
+                        {
+                            rc = VERR_NO_MEMORY;
+                            goto out;
+                        }
+                        RTPathStripFilename(pszDirname);
+                        cbDirname = strlen(pszDirname);
+                        char *pszFullname;
+                        rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
+                                          RTPATH_SLASH, pExtent->pszBasename);
+                        RTStrFree(pszDirname);
+                        if (VBOX_FAILURE(rc))
+                            goto out;
+                        pExtent->pszFullname = pszFullname;
+                        pExtent->enmType = VMDKETYPE_FLAT;
+                        pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->cbPartitionData);
+                        pExtent->uSectorOffset = uPartOffset;
+                        pExtent->enmAccess = VMDKACCESS_READWRITE;
+                        pExtent->fMetaDirty = false;
+
+                        rc = RTFileOpen(&pExtent->File, pExtent->pszFullname,
+                                        RTFILE_O_READWRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE);
+                        if (VBOX_FAILURE(rc))
+                        {
+                            rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new partition data file '%s'"), pExtent->pszFullname);
+                            goto out;
+                        }
+                        rc = RTFileWriteAt(pExtent->File, VMDK_SECTOR2BYTE(uPartOffset), pPart->pvPartitionData, pPart->cbPartitionData, NULL);
+                        if (VBOX_FAILURE(rc))
+                        {
+                            rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not write partition data to '%s'"), pExtent->pszFullname);
+                            goto out;
+                        }
+                        uPartOffset += VMDK_BYTE2SECTOR(pPart->cbPartitionData);
+                    }
+                    if (pPart->cbPartition)
+                    {
+                        if (uStart != pPart->uPartitionStart)
+                        {
+                            pExtent = &pImage->pExtents[cExtents++];
+                            pExtent->pszBasename = NULL;
+                            pExtent->pszFullname = NULL;
+                            pExtent->enmType = VMDKETYPE_ZERO;
+                            pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->uPartitionStart - uStart);
+                            pExtent->uSectorOffset = 0;
+                            pExtent->enmAccess = VMDKACCESS_READWRITE;
+                            pExtent->fMetaDirty = false;
+                        }
+                        uStart = pPart->uPartitionStart + pPart->cbPartition;
+                        pExtent = &pImage->pExtents[cExtents++];
+                        if (pPart->pszRawDevice)
+                        {
+                            /* Set up basename for extent description. Cannot use StrDup. */
+                            size_t cbBasename = strlen(pPart->pszRawDevice) + 1;
+                            char *pszBasename = (char *)RTMemTmpAlloc(cbBasename);
+                            if (!pszBasename)
+                            {
+                                rc = VERR_NO_MEMORY;
+                                goto out;
+                            }
+                            memcpy(pszBasename, pPart->pszRawDevice, cbBasename);
+                            pExtent->pszBasename = pszBasename;
+                            /* For raw disks the full name is identical to the base name. */
+                            pExtent->pszFullname = RTStrDup(pszBasename);
+                            if (!pExtent->pszFullname)
+                            {
+                                rc = VERR_NO_MEMORY;
+                                goto out;
+                            }
+                            pExtent->enmType = VMDKETYPE_FLAT;
+                            pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->cbPartition);
+                            pExtent->uSectorOffset = VMDK_BYTE2SECTOR(pPart->uPartitionStartOffset);
+                            pExtent->enmAccess = VMDKACCESS_READWRITE;
+                            pExtent->fMetaDirty = false;
+
+                            rc = RTFileOpen(&pExtent->File, pExtent->pszFullname,
+                                            RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
+                            if (VBOX_FAILURE(rc))
+                            {
+                                rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not open raw partition file '%s'"), pExtent->pszFullname);
+                                goto out;
+                            }
+                        }
+                        else
+                        {
+                            pExtent->pszBasename = NULL;
+                            pExtent->pszFullname = NULL;
+                            pExtent->enmType = VMDKETYPE_ZERO;
+                            pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->cbPartition);
+                            pExtent->uSectorOffset = 0;
+                            pExtent->enmAccess = VMDKACCESS_READWRITE;
+                            pExtent->fMetaDirty = false;
+                        }
+                    }
+                }
+                /* Another extent for filling up the rest of the image. */
+                if (uStart != cbSize)
+                {
+                    pExtent = &pImage->pExtents[cExtents++];
+                    pExtent->pszBasename = NULL;
+                    pExtent->pszFullname = NULL;
+                    pExtent->enmType = VMDKETYPE_ZERO;
+                    pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize - uStart);
+                    pExtent->uSectorOffset = 0;
+                    pExtent->enmAccess = VMDKACCESS_READWRITE;
+                    pExtent->fMetaDirty = false;
+                }
+
+                pImage->enmImageType = enmType;
+                rc = vmdkDescSetStr(pImage, &pImage->Descriptor, pImage->Descriptor.uFirstDesc, "createType", "\"partitionedDevice\"");
+                if (VBOX_FAILURE(rc))
+                {
+                    rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not set the image type in '%s'"), pszFilename);
+                    goto out;
+                }
             }
         }
@@ -2619 +2837 @@
 
     /* Clip read range to remain in this extent. */
-    cbRead = RT_MIN(cbRead, VMDK_SECTOR2BYTE(pExtent->cNominalSectors - uSectorExtentRel));
+    cbRead = RT_MIN(cbRead, VMDK_SECTOR2BYTE(pExtent->uSectorOffset + pExtent->cNominalSectors - uSectorExtentRel));
 
     /* Handle the read according to the current extent type. */
@@ -2725 +2943 @@
                 {
                     /* Clip write range to remain in this extent. */
-                    cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cNominalSectors - uSectorExtentRel));
+                    cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->uSectorOffset + pExtent->cNominalSectors - uSectorExtentRel));
                     *pcbPreRead = VMDK_SECTOR2BYTE(uSectorExtentRel % pExtent->cSectorsPerGrain);
                     *pcbPostRead = VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain) - cbWrite - *pcbPreRead;
@@ -2738 +2956 @@
         case VMDKETYPE_FLAT:
             /* Clip write range to remain in this extent. */
-            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cNominalSectors - uSectorExtentRel));
+            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->uSectorOffset + pExtent->cNominalSectors - uSectorExtentRel));
             rc = RTFileWriteAt(pExtent->File, VMDK_SECTOR2BYTE(uSectorExtentRel), pvBuf, cbWrite, NULL);
             break;
         case VMDKETYPE_ZERO:
             /* Clip write range to remain in this extent. */
-            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cNominalSectors - uSectorExtentRel));
+            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->uSectorOffset + pExtent->cNominalSectors - uSectorExtentRel));
             break;
     }