Changeset 48854 in vbox for trunk/src/VBox/Storage/DMG.cpp

Timestamp:

Oct 3, 2013 9:48:48 PM (11 years ago)

Author:

vboxsync

Message:

DMG: Fixes for making vbox-img convert work.

File:

• trunk/src/VBox/Storage/DMG.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/DMG.cpp

@@ -457 +457 @@
     {
         /*
-         * The I/O context stuff seems to complicated and undocument that I'm
-         * not going to bother trying implement this efficiently right now.
+         * Alloate a temporary buffer on the stack or heap and use
+         * vdIfIoIntIoCtxCopyTo to work the context.
+         *
+         * The I/O context stuff seems too complicated and undocument that I'm
+         * not going to bother trying to implement this efficiently right now.
          */
         void *pvFree = NULL;
@@ -466 +469 @@
         else
             pvFree = pvBuf = RTMemTmpAlloc(cbToRead);
-        if (!pvBuf)
+        if (pvBuf)
         {
             rc = RTVfsFileReadAt(pThis->hDmgFileInXar, off, pvBuf, cbToRead, NULL);
@@ -1441 +1444 @@
  * @returns VBox status code.
  * @param   fOpen           Flags for defining the open type.
- * @param   pVDIfsIo        The storage I/O interface to use.
+ * @param   pVDIfs          List of VD I/O interfaces that we can use.
  * @param   pvStorage       The storage pointer that goes with @a pVDIfsIo.
  * @param   pszFilename     The input filename, optional.
@@ -1452 +1455 @@
  *          is being in serveral places.
  */
-static int dmgOpenImageWithinXar(uint32_t fOpen, PVDINTERFACEIO pVDIfsIo, void *pvStorage, const char *pszFilename,
+static int dmgOpenImageWithinXar(uint32_t fOpen, PVDINTERFACE pVDIfs, void *pvStorage, const char *pszFilename,
                                  PRTVFSFSSTREAM phXarFss, PRTVFSFILE phDmgFileInXar)
 {
@@ -1458 +1461 @@
      * Open the XAR file stream.
      */
-    if (!pVDIfsIo)
-        return VERR_INVALID_PARAMETER;
-
     RTVFSFILE hVfsFile;
-    int rc = VDIfCreateVfsFile(pVDIfsIo, pvStorage, fOpen, &hVfsFile);
+    int rc = VDIfCreateVfsFile(pVDIfs, pvStorage, fOpen, &hVfsFile);
     if (RT_FAILURE(rc))
         return rc;
@@ -1566 +1566 @@
     {
         rc = dmgOpenImageWithinXar(VDOpenFlagsToFileOpenFlags(uOpenFlags, false /* fCreate */),
-                                   VDIfIoGet(pThis->pVDIfsImage),
+                                   pThis->pVDIfsImage,
                                    pThis->pStorage,
                                    pThis->pszFilename,
@@ -1710 +1710 @@
     {
         rc = dmgOpenImageWithinXar(RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE,
-                                   VDIfIoGet(pVDIfsImage), pStorage, NULL /* pszFilename */,
+                                   pVDIfsImage, pStorage, NULL /* pszFilename */,
                                    &hXarFss, &hDmgFileInXar);
         if (RT_FAILURE(rc))