Changeset 37270 in vbox for trunk

Timestamp:

May 30, 2011 9:25:42 PM (14 years ago)

Author:

vboxsync

Message:

IPRT/Dvm: Commit BSD disklabel support.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/dvm/dvm.cpp (modified) (3 diffs)
• common/dvm/dvmbsdlabel.cpp (added)
• include/internal/dvm.h (modified) (1 diff)
• testcase/tstRTDvm.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -279 +279 @@
         common/dbg/dbgmodnm.cpp \
         common/dvm/dvm.cpp \
+        common/dvm/dvmbsdlabel.cpp \
         common/dvm/dvmgpt.cpp \
         common/dvm/dvmmbr.cpp \

trunk/src/VBox/Runtime/common/dvm/dvm.cpp

@@ -83 +83 @@
 extern RTDVMFMTOPS g_rtDvmFmtMbr;
 extern RTDVMFMTOPS g_rtDvmFmtGpt;
+extern RTDVMFMTOPS g_rtDvmFmtBsdLbl;
 
 /**
@@ -90 +91 @@
 {
     &g_rtDvmFmtMbr,
-    &g_rtDvmFmtGpt
+    &g_rtDvmFmtGpt,
+    &g_rtDvmFmtBsdLbl
 };
 
@@ -233 +235 @@
         }
         else
-            rc = VERR_NOT_FOUND;
+            rc = VERR_NOT_SUPPORTED;
     }
 

trunk/src/VBox/Runtime/include/internal/dvm.h

@@ -227 +227 @@
 typedef const RTDVMFMTOPS *PCRTDVMFMTOPS;
 
+/** Converts a LBA number to the byte offset. */
+#define RTDVM_LBA2BYTE(lba, disk) ((lba) * (disk)->cbSector)
+/** Converts a Byte offset to the LBA number. */
+#define RTDVM_BYTE2LBA(off, disk) ((off) / (disk)->cbSector)
+
 /**
  * Returns the number of sectors in the disk.

trunk/src/VBox/Runtime/testcase/tstRTDvm.cpp

@@ -34 +34 @@
 #include <iprt/dvm.h>
 #include <iprt/file.h>
-
-RTFILE   g_hDisk = NIL_RTFILE;  /**< The disk image. */
-uint64_t g_cbDisk = 0;          /**< Size of the image. */
+#include <iprt/string.h>
+
+/**
+ * Disk structure.
+ */
+typedef struct TSTRTDVMDISK
+{
+    /** Flag whether this disk uses the image file or a volume. */
+    bool            fUseImage;
+    /** Data dependent on the flag. */
+    union
+    {
+        /** File handle of the image. */
+        RTFILE      hImage;
+        /** Handle of the volume. */
+        RTDVMVOLUME hVol;
+    };
+} TSTRTDVMDISK, *PTSTRTDVMDISK;
 
 static int dvmDiskRead(void *pvUser, uint64_t off, void *pvBuf, size_t cbRead)
 {
-    return RTFileReadAt(g_hDisk, off, pvBuf, cbRead, NULL);
+    PTSTRTDVMDISK pDisk = (PTSTRTDVMDISK)pvUser;
+
+    if (pDisk->fUseImage)
+        return RTFileReadAt(pDisk->hImage, off, pvBuf, cbRead, NULL);
+    else
+        return RTDvmVolumeRead(pDisk->hVol, off, pvBuf, cbRead);
 }
 
 static int dvmDiskWrite(void *pvUser, uint64_t off, const void *pvBuf, size_t cbWrite)
 {
-    return RTFileWriteAt(g_hDisk, off, pvBuf, cbWrite, NULL);
+    PTSTRTDVMDISK pDisk = (PTSTRTDVMDISK)pvUser;
+
+    if (pDisk->fUseImage)
+        return RTFileWriteAt(pDisk->hImage, off, pvBuf, cbWrite, NULL);
+    else
+        return RTDvmVolumeWrite(pDisk->hVol, off, pvBuf, cbWrite);
+}
+
+static int tstRTDvmVolume(RTTEST hTest, PTSTRTDVMDISK pDisk, uint64_t cb, unsigned cNesting)
+{
+    char szPrefix[100];
+    int rc = VINF_SUCCESS;
+
+    memset(szPrefix, 0, sizeof(szPrefix));
+
+    if (cNesting < sizeof(szPrefix) - 1)
+    {
+        for (unsigned i = 0; i < cNesting; i++)
+            szPrefix[i] = '\t';
+    }
+
+    RTTestSubF(hTest, "Create DVM");
+    RTDVM hVolMgr;
+    rc = RTDvmCreate(&hVolMgr, dvmDiskRead, dvmDiskWrite, cb, 512, pDisk);
+    if (RT_FAILURE(rc))
+    {
+        RTTestIFailed("RTDvmCreate -> %Rrc", rc);
+        return RTTestSummaryAndDestroy(hTest);
+    }
+
+    RTTestSubF(hTest, "Open volume map");
+    rc = RTDvmMapOpen(hVolMgr);
+    if (   RT_FAILURE(rc)
+        && rc != VERR_NOT_SUPPORTED)
+    {
+        RTTestIFailed("RTDvmOpen -> %Rrc", rc);
+        return RTTestSummaryAndDestroy(hTest);
+    }
+    else if (rc == VERR_NOT_SUPPORTED)
+        return VINF_SUCCESS;
+
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Successfully opened map with format: %s.\n", szPrefix, RTDvmMapGetFormat(hVolMgr));
+
+    /* Dump all volumes. */
+    RTTestSubF(hTest, "Dump volumes");
+    uint32_t cVolume = 0;
+    RTDVMVOLUME hVol;
+
+    rc = RTDvmMapQueryFirstVolume(hVolMgr, &hVol);
+
+    while (RT_SUCCESS(rc))
+    {
+        char *pszVolName = NULL;
+        RTDVMVOLTYPE enmVolType = RTDvmVolumeGetType(hVol);
+        uint64_t fVolFlags = RTDvmVolumeGetFlags(hVol);
+
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Volume %u:\n", szPrefix, cVolume);
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Volume type  %s\n", szPrefix, RTDvmVolumeTypeGetDescr(enmVolType));
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Volume size  %llu\n", szPrefix, RTDvmVolumeGetSize(hVol));
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Volume flags %s %s\n\n", szPrefix,
+                      fVolFlags & DVMVOLUME_FLAGS_BOOTABLE ? "Bootable" : "",
+                      fVolFlags & DVMVOLUME_FLAGS_ACTIVE ? "Active" : "");
+
+        rc = RTDvmVolumeQueryName(hVol, &pszVolName);
+        if (RT_SUCCESS(rc))
+        {
+            RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Volume name %s.\n", szPrefix, pszVolName);
+            RTStrFree(pszVolName);
+        }
+        else if (rc != VERR_NOT_SUPPORTED)
+            RTTestIFailed("RTDvmVolumeQueryName -> %Rrc", rc);
+        else
+            rc = VINF_SUCCESS;
+
+        /*
+         * Query all volumes which might be inside this.
+         * (think of MBR partitions with a bsdlabel inside)
+         */
+        TSTRTDVMDISK Disk;
+        Disk.fUseImage = false;
+        Disk.hVol      = hVol;
+        rc = tstRTDvmVolume(hTest, &Disk, RTDvmVolumeGetSize(hVol), cNesting + 1);
+
+        RTDVMVOLUME hVolNext;
+        rc = RTDvmMapQueryNextVolume(hVolMgr, hVol, &hVolNext);
+        RTDvmVolumeRelease(hVol);
+        hVol = hVolNext;
+        cVolume++;
+    }
+
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "%s Dumped %u volumes\n", szPrefix, cVolume);
+
+    if (   rc == VERR_DVM_MAP_EMPTY
+        || rc == VERR_DVM_MAP_NO_VOLUME)
+        rc = VINF_SUCCESS;
+
+    RTTESTI_CHECK(rc == VINF_SUCCESS);
+
+    RTDvmRelease(hVolMgr);
+
+    return rc;
 }
 
@@ -69 +189 @@
 
     /* Open image. */
-    rc = RTFileOpen(&g_hDisk, argv[1], RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_READWRITE);
+    RTFILE hFile;
+    uint64_t cb = 0;
+    rc = RTFileOpen(&hFile, argv[1], RTFILE_O_OPEN | RTFILE_O_DENY_NONE | RTFILE_O_READWRITE);
     if (RT_FAILURE(rc))
     {
@@ -76 +198 @@
     }
 
-    rc = RTFileGetSize(g_hDisk, &g_cbDisk);
+    rc = RTFileGetSize(hFile, &cb);
     if (   RT_FAILURE(rc)
-        || g_cbDisk % 512 != 0) /* Assume 512 byte sector size. */
+        || cb % 512 != 0) /* Assume 512 byte sector size. */
     {
         RTTestIFailed("RTFileGetSize -> %Rrc", rc);
@@ -84 +206 @@
     }
 
-    RTTestSubF(hTest, "Create DVM");
-    RTDVM hVolMgr;
-    rc = RTDvmCreate(&hVolMgr, dvmDiskRead, dvmDiskWrite, g_cbDisk, 512, NULL);
-    if (RT_FAILURE(rc))
-    {
-        RTTestIFailed("RTDvmCreate -> %Rrc", rc);
-        return RTTestSummaryAndDestroy(hTest);
-    }
-
-    RTTestSubF(hTest, "Open volume map");
-    rc = RTDvmMapOpen(hVolMgr);
-    if (RT_FAILURE(rc))
-    {
-        RTTestIFailed("RTDvmOpen -> %Rrc", rc);
-        return RTTestSummaryAndDestroy(hTest);
-    }
-
-    RTTestIPrintf(RTTESTLVL_ALWAYS, " Successfully opened map with format: %s.\n", RTDvmMapGetFormat(hVolMgr));
-
-    /* Dump all volumes. */
-    RTTestSubF(hTest, "Dump volumes");
-    uint32_t cVolume = 0;
-    RTDVMVOLUME hVol;
-
-    rc = RTDvmMapQueryFirstVolume(hVolMgr, &hVol);
-
-    while (RT_SUCCESS(rc))
-    {
-        RTDVMVOLTYPE enmVolType = RTDvmVolumeGetType(hVol);
-        uint64_t fVolFlags = RTDvmVolumeGetFlags(hVol);
-
-        RTTestIPrintf(RTTESTLVL_ALWAYS, " Volume %u:\n", cVolume);
-        RTTestIPrintf(RTTESTLVL_ALWAYS, " Volume type  %s.\n", RTDvmVolumeTypeGetDescr(enmVolType));
-        RTTestIPrintf(RTTESTLVL_ALWAYS, " Volume size  %llu.\n", RTDvmVolumeGetSize(hVol));
-        RTTestIPrintf(RTTESTLVL_ALWAYS, " Volume flags %s %s.\n\n", 
-                      fVolFlags & DVMVOLUME_FLAGS_BOOTABLE ? "Bootable" : "",
-                      fVolFlags & DVMVOLUME_FLAGS_ACTIVE ? "Active" : "");
-
-        RTDVMVOLUME hVolNext;
-        rc = RTDvmMapQueryNextVolume(hVolMgr, hVol, &hVolNext);
-        RTDvmVolumeRelease(hVol);
-        hVol = hVolNext;
-        cVolume++;
-    }
-
-    RTTestIPrintf(RTTESTLVL_ALWAYS, " Dumped %u volumes\n", cVolume);
-
-    if (   rc == VERR_DVM_MAP_EMPTY
-        || rc == VERR_DVM_MAP_NO_VOLUME)
-        rc = VINF_SUCCESS;
+    TSTRTDVMDISK Disk;
+
+    Disk.fUseImage = true;
+    Disk.hImage    = hFile;
+    rc = tstRTDvmVolume(hTest, &Disk, cb, 0);
 
     RTTESTI_CHECK(rc == VINF_SUCCESS);
-
-    RTDvmRelease(hVolMgr);
 
     /*