Changeset 48854 in vbox for trunk/src/VBox/Storage

Timestamp:

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

Author:

vboxsync

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

89523

Message:

DMG: Fixes for making vbox-img convert work.

Location:

trunk/src/VBox/Storage

Files:

• DMG.cpp (modified) (7 diffs)
• VDIfVfs.cpp (modified) (10 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))

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -31 +31 @@
 #include <iprt/poll.h>
 #include <VBox/vd.h>
+#include <VBox/vd-ifs-internal.h>
 
 /*******************************************************************************
@@ -41 +42 @@
 typedef struct VDIFVFSIOSFILE
 {
-    /** The VD I/O interface we wrap. */
-    PVDINTERFACEIO  pVDIfsIo;
+    /** The VD I/O interface we prefer wrap.
+     *  Can be NULL, in which case pVDIfsIoInt must be valid. */
+    PVDINTERFACEIO      pVDIfsIo;
+    /** The VD I/O interface we alternatively can wrap.
+        Can be NULL, in which case pVDIfsIo must be valid. */
+    PVDINTERFACEIOINT   pVDIfsIoInt;
     /** User pointer to pass to the VD I/O interface methods. */
-    void           *pvStorage;
+    PVDIOSTORAGE        pStorage;
     /** The current stream position. */
-    RTFOFF          offCurPos;
+    RTFOFF              offCurPos;
 } VDIFVFSIOSFILE;
 /** Pointer to a the internal data of a DVM volume file. */
@@ -89 +94 @@
     if (off == -1)
         off = pThis->offCurPos;
-    int rc = vdIfIoFileReadSync(pThis->pVDIfsIo, pThis->pvStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbRead);
+    int rc;
+    if (pThis->pVDIfsIo)
+        rc = vdIfIoFileReadSync(pThis->pVDIfsIo, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbRead);
+    else
+    {
+        rc = vdIfIoIntFileReadSync(pThis->pVDIfsIoInt, (PVDIOSTORAGE)pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg);
+        if (pcbRead)
+            *pcbRead = RT_SUCCESS(rc) ? pSgBuf->paSegs[0].cbSeg : 0;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -115 +128 @@
     if (off == -1)
         off = pThis->offCurPos;
-    int rc = vdIfIoFileWriteSync(pThis->pVDIfsIo, pThis->pvStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbWritten);
+    int rc;
+    if (pThis->pVDIfsIo)
+        rc = vdIfIoFileWriteSync(pThis->pVDIfsIo, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg, pcbWritten);
+    else
+    {
+        rc = vdIfIoIntFileWriteSync(pThis->pVDIfsIoInt, pThis->pStorage, off, pSgBuf[0].pvSegCur, pSgBuf->paSegs[0].cbSeg);
+        if (pcbWritten)
+            *pcbWritten = RT_SUCCESS(rc) ? pSgBuf->paSegs[0].cbSeg : 0;
+    }
     if (RT_SUCCESS(rc))
         pThis->offCurPos = off + (pcbWritten ? *pcbWritten : pSgBuf->paSegs[0].cbSeg);
@@ -128 +149 @@
 {
     PVDIFVFSIOSFILE pThis = (PVDIFVFSIOSFILE)pvThis;
-    return vdIfIoFileFlushSync(pThis->pVDIfsIo, pThis->pvStorage);
+    int rc;
+    if (pThis->pVDIfsIo)
+        rc = vdIfIoFileFlushSync(pThis->pVDIfsIo, pThis->pStorage);
+    else
+        rc = vdIfIoIntFileFlushSync(pThis->pVDIfsIoInt, pThis->pStorage);
+    return rc;
 }
 
@@ -202 +228 @@
     if (RT_SUCCESS(rc))
     {
-        pThis->pVDIfsIo  = pVDIfsIo;
-        pThis->pvStorage = pvStorage;
-        pThis->offCurPos = 0;
+        pThis->pVDIfsIo     = pVDIfsIo;
+        pThis->pVDIfsIoInt  = NULL;
+        pThis->pStorage     = (PVDIOSTORAGE)pvStorage;
+        pThis->offCurPos    = 0;
 
         *phVfsIos = hVfsIos;
@@ -262 +289 @@
 
     uint64_t cbFile;
-    int rc = vdIfIoFileGetSize(pThis->pVDIfsIo, pThis->pvStorage, &cbFile);
+    int rc;
+    if (pThis->pVDIfsIo)
+        rc = vdIfIoFileGetSize(pThis->pVDIfsIo, pThis->pStorage, &cbFile);
+    else
+        rc = vdIfIoIntFileGetSize(pThis->pVDIfsIoInt, pThis->pStorage, &cbFile);
     if (RT_FAILURE(rc))
         return rc;
@@ -304 +335 @@
 {
     PVDIFVFSIOSFILE pThis = (PVDIFVFSIOSFILE)pvThis;
-    return vdIfIoFileGetSize(pThis->pVDIfsIo, pThis->pvStorage, pcbFile);
+    int rc;
+    if (pThis->pVDIfsIo)
+        rc = vdIfIoFileGetSize(pThis->pVDIfsIo, pThis->pStorage, pcbFile);
+    else
+        rc = vdIfIoIntFileGetSize(pThis->pVDIfsIoInt, pThis->pStorage, pcbFile);
+    return rc;
 }
 
@@ -350 +386 @@
 
 
-VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACEIO pVDIfsIo, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile)
-{
-    AssertPtrReturn(pVDIfsIo, VERR_INVALID_HANDLE);
+VBOXDDU_DECL(int) VDIfCreateVfsFile(PVDINTERFACE pVDIfs, void *pvStorage, uint32_t fFlags, PRTVFSFILE phVfsFile)
+{
+    AssertPtrReturn(pVDIfs, VERR_INVALID_HANDLE);
     AssertPtrReturn(phVfsFile, VERR_INVALID_POINTER);
+
+    PVDINTERFACEIO    pPreferred   = VDIfIoGet(pVDIfs);
+    PVDINTERFACEIOINT pAlternative = VDIfIoIntGet(pVDIfs);
+    AssertReturn(pPreferred || pAlternative, VERR_INVALID_HANDLE);
 
     /*
@@ -364 +404 @@
     if (RT_SUCCESS(rc))
     {
-        pThis->pVDIfsIo  = pVDIfsIo;
-        pThis->pvStorage = pvStorage;
-        pThis->offCurPos = 0;
+        pThis->pVDIfsIo     = pPreferred;
+        pThis->pVDIfsIoInt  = pAlternative;
+        pThis->pStorage     = (PVDIOSTORAGE)pvStorage;
+        pThis->offCurPos    = 0;
 
         *phVfsFile = hVfsFile;