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

Timestamp:

Jan 8, 2013 1:23:54 PM (12 years ago)

Author:

vboxsync

Message:

Storage/Backends: async/sync I/O unification, remove separate entries for sync and async I/O callbacks, remove unused code

File:

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

trunk/src/VBox/Storage/DMG.cpp

@@ -1660 +1660 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnRead */
-static int dmgRead(void *pBackendData, uint64_t uOffset, void *pvBuf,
-                   size_t cbToRead, size_t *pcbActuallyRead)
-{
-    LogFlowFunc(("pBackendData=%#p uOffset=%llu pvBuf=%#p cbToRead=%zu pcbActuallyRead=%#p\n", pBackendData, uOffset, pvBuf, cbToRead, pcbActuallyRead));
+static int dmgRead(void *pBackendData, uint64_t uOffset,  size_t cbToRead,
+                   PVDIOCTX pIoCtx, size_t *pcbActuallyRead)
+{
+    LogFlowFunc(("pBackendData=%#p uOffset=%llu pIoCtx=%#p cbToRead=%zu pcbActuallyRead=%#p\n",
+                 pBackendData, uOffset, pIoCtx, cbToRead, pcbActuallyRead));
     PDMGIMAGE pThis = (PDMGIMAGE)pBackendData;
     PDMGEXTENT pExtent = NULL;
@@ -1692 +1693 @@
             case DMGEXTENTTYPE_RAW:
             {
-                rc = vdIfIoIntFileReadSync(pThis->pIfIo, pThis->pStorage,
+                rc = vdIfIoIntFileReadUser(pThis->pIfIo, pThis->pStorage,
                                            pExtent->offFileStart + DMG_BLOCK2BYTE(uExtentRel),
-                                           pvBuf, cbToRead);
+                                           pIoCtx, cbToRead);
                 break;
             }
             case DMGEXTENTTYPE_ZERO:
             {
-                memset(pvBuf, 0, cbToRead);
+                vdIfIoIntIoCtxSet(pThis->pIfIo, pIoCtx, 0, cbToRead);
                 break;
             }
@@ -1729 +1730 @@
 
                 if (RT_SUCCESS(rc))
-                    memcpy(pvBuf, (uint8_t *)pThis->pvDecompExtent + DMG_BLOCK2BYTE(uExtentRel), cbToRead);
+                    vdIfIoIntIoCtxCopyTo(pThis->pIfIo, pIoCtx,
+                                         (uint8_t *)pThis->pvDecompExtent + DMG_BLOCK2BYTE(uExtentRel),
+                                         cbToRead);
                 break;
             }
@@ -1748 +1751 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnWrite */
-static int dmgWrite(void *pBackendData, uint64_t uOffset, const void *pvBuf,
-                    size_t cbToWrite, size_t *pcbWriteProcess,
-                    size_t *pcbPreRead, size_t *pcbPostRead, unsigned fWrite)
-{
-    LogFlowFunc(("pBackendData=%#p uOffset=%llu pvBuf=%#p cbToWrite=%zu pcbWriteProcess=%#p pcbPreRead=%#p pcbPostRead=%#p\n",
-                 pBackendData, uOffset, pvBuf, cbToWrite, pcbWriteProcess, pcbPreRead, pcbPostRead));
+static int dmgWrite(void *pBackendData, uint64_t uOffset, size_t cbToWrite,
+                    PVDIOCTX pIoCtx, size_t *pcbWriteProcess, size_t *pcbPreRead,
+                    size_t *pcbPostRead, unsigned fWrite)
+{
+    LogFlowFunc(("pBackendData=%#p uOffset=%llu pIoCtx=%#p cbToWrite=%zu pcbWriteProcess=%#p pcbPreRead=%#p pcbPostRead=%#p\n",
+                 pBackendData, uOffset, pIoCtx, cbToWrite, pcbWriteProcess, pcbPreRead, pcbPostRead));
     PDMGIMAGE pThis = (PDMGIMAGE)pBackendData;
     int rc = VERR_NOT_IMPLEMENTED;
@@ -1775 +1778 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnFlush */
-static int dmgFlush(void *pBackendData)
+static int dmgFlush(void *pBackendData, PVDIOCTX pIoCtx)
 {
     LogFlowFunc(("pBackendData=%#p\n", pBackendData));
@@ -2269 +2272 @@
     /* pfnFlush */
     dmgFlush,
+    /* pfnDiscard */
+    NULL,
     /* pfnGetVersion */
     dmgGetVersion,
@@ -2321 +2326 @@
     /* pfnSetParentFilename */
     NULL,
-    /* pfnAsyncRead */
-    NULL,
-    /* pfnAsyncWrite */
-    NULL,
-    /* pfnAsyncFlush */
-    NULL,
     /* pfnComposeLocation */
     genericFileComposeLocation,
@@ -2335 +2334 @@
     /* pfnResize */
     NULL,
-    /* pfnDiscard */
-    NULL,
-    /* pfnAsyncDiscard */
-    NULL,
     /* pfnRepair */
     NULL