Changeset 48871 in vbox

Timestamp:

Oct 4, 2013 2:50:59 AM (11 years ago)

Author:

vboxsync

Message:

DMG: Fixes.

Location:

trunk

Files:

• include/VBox/vd-ifs.h (modified) (2 diffs)
• src/VBox/Storage/DMG.cpp (modified) (14 diffs)
• src/VBox/Storage/VDIfVfs.cpp (modified) (2 diffs)

trunk/include/VBox/vd-ifs.h

@@ -630 +630 @@
  *
  * @return  VBox status code.
- * @param   pVDIfs          List of VD I/O interface we can use.
+ * @param   pVDIfs          Pointer to the VD I/O interface.  If NULL, then @a
+ *                          pVDIfsInt must be specified.
+ * @param   pVDIfsInt       Pointer to the internal VD I/O interface.  If NULL,
+ *                          then @ pVDIfs must be specified.
  * @param   pvStorage       The storage argument to pass to the interface
  *                          methods.
@@ -636 +639 @@
  * @param   phVfsFile       Where to return the VFS file handle on success.
  */
-VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACE pVDIfs, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile);
+VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACEIO pVDIfs, struct VDINTERFACEIOINT *pVDIfsInt, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile);
 
 

trunk/src/VBox/Storage/DMG.cpp

@@ -39 +39 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
+#if 0
+/** @def VBOX_WITH_DIRECT_XAR_ACCESS
+ * When defined, we will use RTVfs to access the XAR file instead of going
+ * the slightly longer way thru the VFS -> VD wrapper. */
+# define VBOX_WITH_DIRECT_XAR_ACCESS
+#endif
 
 /** Sector size, multiply with all sector counts to get number of bytes. */
@@ -787 +793 @@
     int rc = VINF_SUCCESS;
 
-    if (   pThis->pStorage
+    if (   pThis
+        && (pThis->pStorage || pThis->hDmgFileInXar != NIL_RTVFSFILE)
         && !(pThis->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
-        /* @todo handle writable files, update checksums etc. */
+        /** @todo handle writable files, update checksums etc. */
     }
 
@@ -809 +816 @@
     if (pThis)
     {
+        RTVfsFileRelease(pThis->hDmgFileInXar);
+        pThis->hDmgFileInXar = NIL_RTVFSFILE;
+
+        RTVfsFsStrmRelease(pThis->hXarFss);
+        pThis->hXarFss = NIL_RTVFSFSSTREAM;
+
         if (pThis->pStorage)
         {
-            RTVfsFileRelease(pThis->hDmgFileInXar);
-            pThis->hDmgFileInXar = NIL_RTVFSFILE;
-            RTVfsFsStrmRelease(pThis->hXarFss);
-            pThis->hXarFss = NIL_RTVFSFSSTREAM;
-
             /* No point updating the file that is deleted anyway. */
             if (!fDelete)
@@ -1444 +1452 @@
  * @returns VBox status code.
  * @param   fOpen           Flags for defining the open type.
- * @param   pVDIfs          List of VD I/O interfaces that we can use.
+ * @param   pVDIfIoInt      The internal VD I/O interface to use.
  * @param   pvStorage       The storage pointer that goes with @a pVDIfsIo.
  * @param   pszFilename     The input filename, optional.
@@ -1455 +1463 @@
  *          is being in serveral places.
  */
-static int dmgOpenImageWithinXar(uint32_t fOpen, PVDINTERFACE pVDIfs, void *pvStorage, const char *pszFilename,
+static int dmgOpenImageWithinXar(uint32_t fOpen, PVDINTERFACEIOINT pVDIfIoInt, void *pvStorage, const char *pszFilename,
                                  PRTVFSFSSTREAM phXarFss, PRTVFSFILE phDmgFileInXar)
 {
@@ -1462 +1470 @@
      */
     RTVFSFILE hVfsFile;
-    int rc = VDIfCreateVfsFile(pVDIfs, pvStorage, fOpen, &hVfsFile);
+#ifdef VBOX_WITH_DIRECT_XAR_ACCESS
+    int rc = RTVfsFileOpenNormal(pszFilename, fOpen, &hVfsFile);
+#else
+    int rc = VDIfCreateVfsFile(NULL, pVDIfIoInt, pvStorage, fOpen, &hVfsFile);
+#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -1566 +1578 @@
     {
         rc = dmgOpenImageWithinXar(VDOpenFlagsToFileOpenFlags(uOpenFlags, false /* fCreate */),
-                                   pThis->pVDIfsImage,
+                                   pThis->pIfIoXxx,
                                    pThis->pStorage,
                                    pThis->pszFilename,
@@ -1572 +1584 @@
         if (RT_FAILURE(rc))
             return rc;
-    }
+#ifdef VBOX_WITH_DIRECT_XAR_ACCESS
+        vdIfIoIntFileClose(pThis->pIfIoXxx, pThis->pStorage);
+        pThis->pStorage = NULL;
+#endif
+    }
+#if 0 /* This is for testing whether the VFS wrappers actually works. */
+    else
+    {
+        rc = RTVfsFileOpenNormal(pThis->pszFilename, VDOpenFlagsToFileOpenFlags(uOpenFlags, false /* fCreate */),
+                                 &pThis->hDmgFileInXar);
+        if (RT_FAILURE(rc))
+            return rc;
+        vdIfIoIntFileClose(pThis->pIfIoXxx, pThis->pStorage);
+        pThis->pStorage = NULL;
+    }
+#endif
 
     /*
@@ -1710 +1737 @@
     {
         rc = dmgOpenImageWithinXar(RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE,
-                                   pVDIfsImage, pStorage, NULL /* pszFilename */,
+                                   pIfIo, pStorage, pszFilename,
                                    &hXarFss, &hDmgFileInXar);
         if (RT_FAILURE(rc))
@@ -1737 +1764 @@
              * Do we recognize this stuff? Does it look valid?
              */
-            if (   Ftr.u32Magic    == RT_H2BE_U32(DMGUDIF_MAGIC)
-                && Ftr.u32Version  == RT_H2BE_U32(DMGUDIF_VER_CURRENT)
-                && Ftr.cbFooter    == RT_H2BE_U32(sizeof(Ftr)))
+            if (   Ftr.u32Magic    == RT_H2BE_U32_C(DMGUDIF_MAGIC)
+                && Ftr.u32Version  == RT_H2BE_U32_C(DMGUDIF_VER_CURRENT)
+                && Ftr.cbFooter    == RT_H2BE_U32_C(sizeof(Ftr)))
             {
                 dmgUdifFtrFile2HostEndian(&Ftr);
@@ -2009 +2036 @@
     AssertPtr(pThis);
 
-    if (pThis && pThis->pStorage)
+    if (pThis && (pThis->pStorage || pThis->hDmgFileInXar != NIL_RTVFSFILE))
         cb = 2048;
 
@@ -2025 +2052 @@
     AssertPtr(pThis);
 
-    if (pThis && pThis->pStorage)
+    if (pThis && (pThis->pStorage || pThis->hDmgFileInXar != NIL_RTVFSFILE))
         cb = pThis->cbSize;
 
@@ -2041 +2068 @@
     AssertPtr(pThis);
 
-    if (pThis && pThis->pStorage)
+    if (pThis && (pThis->pStorage || pThis->hDmgFileInXar != NIL_RTVFSFILE))
     {
         uint64_t cbFile;
@@ -2436 +2463 @@
     if (pThis)
     {
-        vdIfErrorMessage(pThis->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%llu\n",
+        vdIfErrorMessage(pThis->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cSectors=%llu\n",
                          pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors,
                          pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors,
-                         pThis->cbSize / 512);
+                         pThis->cbSize / DMG_SECTOR_SIZE);
     }
 }

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -386 +386 @@
 
 
-VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACE pVDIfs, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile)
-{
-    AssertPtrReturn(pVDIfs, VERR_INVALID_HANDLE);
+VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACEIO pVDIfs, struct VDINTERFACEIOINT *pVDIfsInt, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile)
+{
+    AssertReturn((pVDIfs != NULL) != (pVDIfsInt != NULL), VERR_INVALID_PARAMETER); /* Exactly one needs to be specified. */
     AssertPtrReturn(phVfsFile, VERR_INVALID_POINTER);
-
-    PVDINTERFACEIO    pPreferred   = VDIfIoGet(pVDIfs);
-    PVDINTERFACEIOINT pAlternative = VDIfIoIntGet(pVDIfs);
-    AssertReturn(pPreferred || pAlternative, VERR_INVALID_HANDLE);
 
     /*
@@ -404 +400 @@
     if (RT_SUCCESS(rc))
     {
-        pThis->pVDIfsIo     = pPreferred;
-        pThis->pVDIfsIoInt  = pAlternative;
+        pThis->pVDIfsIo     = pVDIfs;
+        pThis->pVDIfsIoInt  = pVDIfsInt;
         pThis->pStorage     = (PVDIOSTORAGE)pvStorage;
         pThis->offCurPos    = 0;