Changeset 69840 in vbox for trunk/src/VBox/Storage/testcase

Timestamp:

Nov 27, 2017 3:19:30 PM (7 years ago)

Author:

vboxsync

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

119281

Message:

IPRT: VFS volume mouning cleanup, replacing RTFilesystemVfsFromFile with RTVfsMountVol.

• RTVfsMountVol will do basic file system recognizion and call the right file system volume open API.
• Moved ext2 definitions to iprt/formats/ext2.h, dropping unnecessary pragma pack(1) and adjusted names.
• Added RTFsExt2VolOpen.
• Removed iprt/filesystem.h.
• Removed include/internal/filesystem.h.
• Nothing has been tested yet! :-)

File:

• trunk/src/VBox/Storage/testcase/vbox-img.cpp (modified) (8 diffs)

trunk/src/VBox/Storage/testcase/vbox-img.cpp

@@ -36 +36 @@
 #include <iprt/assert.h>
 #include <iprt/dvm.h>
-#include <iprt/filesystem.h>
 #include <iprt/vfs.h>
 
@@ -1360 +1359 @@
 static int handleCompact(HandlerArg *a)
 {
-    int rc = VINF_SUCCESS;
     PVDISK pDisk = NULL;
-    const char *pszFilename = NULL;
-    bool fFilesystemAware = false;
     VDINTERFACEQUERYRANGEUSE VDIfQueryRangeUse;
     PVDINTERFACE pIfsCompact = NULL;
@@ -1372 +1368 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--filename",        'f', RTGETOPT_REQ_STRING },
-        { "--filesystemaware", 'a', RTGETOPT_REQ_NOTHING }
+        { "--filename",          'f', RTGETOPT_REQ_STRING },
+        { "--filesystemaware",   'a', RTGETOPT_REQ_NOTHING },
+        { "--file-system-aware", 'a', RTGETOPT_REQ_NOTHING },
     };
+
+    const char *pszFilename      = NULL;
+    bool        fFilesystemAware = false;
+    bool        fVerbose         = true;
+
     int ch;
     RTGETOPTUNION ValueUnion;
@@ -1405 +1407 @@
     char *pszFormat = NULL;
     VDTYPE enmType = VDTYPE_INVALID;
-    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat, &enmType);
+    int rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat, &enmType);
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);
@@ -1419 +1421 @@
         return errorRuntime("Error while opening the image: %Rrf (%Rrc)\n", rc, rc);
 
+    /*
+     * If --file-system-aware, we first ask the disk volume manager (DVM) to
+     * find the volumes on the disk.
+     */
     if (   RT_SUCCESS(rc)
         && fFilesystemAware)
@@ -1434 +1440 @@
                     && RTDvmMapGetValidVolumes(hDvm) > 0)
                 {
-                    /* Get all volumes and set the block query status callback. */
+                    /*
+                     * Enumerate the volumes: Try finding a file system interpreter and
+                     * set the block query status callback to work with the FS.
+                     */
+                    uint32_t    iVol = 0;
                     RTDVMVOLUME hVol;
                     rc = RTDvmMapQueryFirstVolume(hDvm, &hVol);
@@ -1441 +1451 @@
                     while (RT_SUCCESS(rc))
                     {
+                        if (fVerbose)
+                        {
+                            char *pszVolName;
+                            rc = RTDvmVolumeQueryName(hVol, &pszVolName);
+                            if (RT_FAILURE(rc))
+                                pszVolName = NULL;
+                            RTMsgInfo("Vol%u: %Rhcb %u %s%s%s\n", iVol, RTDvmVolumeGetSize(hVol),
+                                      RTDvmVolumeTypeGetDescr(RTDvmVolumeGetType(hVol)),
+                                      pszVolName ? " " : "", pszVolName ? pszVolName : "");
+                            RTStrFree(pszVolName);
+                        }
+
                         RTVFSFILE hVfsFile;
                         rc = RTDvmVolumeCreateVfsFile(hVol, RTFILE_O_READWRITE, &hVfsFile);
                         if (RT_FAILURE(rc))
+                        {
+                            errorRuntime("RTDvmVolumeCreateVfsFile failed: %Rrc\n");
                             break;
+                        }
 
                         /* Try to detect the filesystem in this volume. */
+                        RTERRINFOSTATIC ErrInfo;
                         RTVFS hVfs;
-                        rc = RTFilesystemVfsFromFile(hVfsFile, &hVfs);
-                        if (rc == VERR_NOT_SUPPORTED)
-                        {
-                            /* Release the file handle and continue.*/
-                            RTVfsFileRelease(hVfsFile);
-                        }
-                        else if (RT_FAILURE(rc))
-                            break;
-                        else
+                        rc = RTVfsMountVol(hVfsFile, RTVFSMNT_F_READ_ONLY | RTVFSMNT_F_FOR_RANGE_IN_USE, &hVfs,
+                                           RTErrInfoInitStatic(&ErrInfo));
+                        RTVfsFileRelease(hVfsFile);
+                        if (RT_SUCCESS(rc))
                         {
                             PVBOXIMGVFS pVBoxImgVfs = (PVBOXIMGVFS)RTMemAllocZ(sizeof(VBOXIMGVFS));
                             if (!pVBoxImgVfs)
+                            {
+                                RTVfsRelease(hVfs);
                                 rc = VERR_NO_MEMORY;
-                            else
-                            {
-                                pVBoxImgVfs->hVfs = hVfs;
-                                pVBoxImgVfs->pNext = pVBoxImgVfsHead;
-                                pVBoxImgVfsHead = pVBoxImgVfs;
-                                RTDvmVolumeSetQueryBlockStatusCallback(hVol, vboximgQueryBlockStatus, hVfs);
+                                break;
                             }
+                            pVBoxImgVfs->hVfs = hVfs;
+                            pVBoxImgVfs->pNext = pVBoxImgVfsHead;
+                            pVBoxImgVfsHead = pVBoxImgVfs;
+                            RTDvmVolumeSetQueryBlockStatusCallback(hVol, vboximgQueryBlockStatus, hVfs);
                         }
-
+                        else if (rc != VERR_NOT_SUPPORTED)
+                        {
+                            if (RTErrInfoIsSet(&ErrInfo.Core))
+                                errorRuntime("RTVfsMountVol failed: %s\n", ErrInfo.Core.pszMsg);
+                            break;
+                        }
+                        else if (fVerbose && RTErrInfoIsSet(&ErrInfo.Core))
+                            RTMsgInfo("Unsupported file system: %s", ErrInfo.Core.pszMsg);
+
+                        /*
+                         * Advance.  (Releasing hVol here is fine since RTDvmVolumeCreateVfsFile
+                         * retained a reference and the hVfs a reference of it again.)
+                         */
                         RTDVMVOLUME hVolNext = NIL_RTDVMVOLUME;
                         if (RT_SUCCESS(rc))
                             rc = RTDvmMapQueryNextVolume(hDvm, hVol, &hVolNext);
-
-                        /*
-                         * Release the volume handle, the file handle has a reference
-                         * to keep it open.
-                         */
                         RTDvmVolumeRelease(hVol);
                         hVol = hVolNext;
+                        iVol++;
                     }
 
@@ -1496 +1526 @@
                 else if (rc == VERR_NOT_FOUND)
                 {
+                    RTPrintf("No known volume format on disk found\n");
                     rc = VINF_SUCCESS;
-                    RTPrintf("No known volume format on disk found\n");
                 }
                 else