Changeset 51073 in vbox

Timestamp:

Apr 15, 2014 10:19:33 AM (11 years ago)

Author:

vboxsync

Message:

VD: Fixes for filter support

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -206 +206 @@
     /** Pointer to the filter backend interface. */
     PCVDFILTERBACKEND  pBackend;
+    /** Pointer to list of VD interfaces, per-filter. */
+    PVDINTERFACE        pVDIfsFilter;
+    /** I/O related things. */
+    VDIO                VDIo;
 } VDFILTER;
 /** Pointer to a VD filter instance. */
@@ -992 +996 @@
     {
         PVDFILTER pFilterCurr = pDisk->pFilterHead;
+
+        /* Reset buffer before starting. */
+        RTSgBufReset(&pIoCtx->Req.Io.SgBuf);
 
         do
@@ -4842 +4849 @@
     size_t cbCreated = 0;
 
+    /** @todo: It is possible that this gets called from a filter plugin
+     * outside of the disk lock. Refine assertion or remove completely. */
+#if 0
     /** @todo: Enable check for sync I/O later. */
     if (!(pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC))
         VD_IS_LOCKED(pDisk);
+#endif
 
     cbCreated = RTSgBufSegArrayCreate(&pIoCtx->Req.Io.SgBuf, paSeg, pcSeg, cbData);
@@ -6174 +6185 @@
         }
 
-        rc = pFilter->pBackend->pfnCreate(pDisk->pVDIfsDisk, pVDIfsFilter,
+        pFilter->VDIo.pDisk   = pDisk;
+        pFilter->pVDIfsFilter = pVDIfsFilter;
+
+        /* Set up the internal I/O interface. */
+        AssertBreakStmt(!VDIfIoIntGet(pVDIfsFilter), rc = VERR_INVALID_PARAMETER);
+        vdIfIoIntCallbacksSetup(&pFilter->VDIo.VDIfIoInt);
+        rc = VDInterfaceAdd(&pFilter->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
+                            &pFilter->VDIo, sizeof(VDINTERFACEIOINT), &pFilter->pVDIfsFilter);
+        AssertRC(rc);
+
+        rc = pFilter->pBackend->pfnCreate(pDisk->pVDIfsDisk, pFilter->pVDIfsFilter,
                                           &pFilter->pvBackendData);
 
@@ -9972 +9993 @@
         {
             if (ASMAtomicCmpXchgBool(&pIoCtx->fComplete, true, false))
+            {
+                rc2 = vdFilterChainApplyRead(pDisk, pIoCtx->Req.Io.uOffsetXferOrig,
+                                             pIoCtx->Req.Io.cbXferOrig, pIoCtx);
+                if (RT_FAILURE(rc2))
+                    rc = rc2;
                 vdIoCtxFree(pDisk, pIoCtx);
+            }
             else
                 rc = VERR_VD_ASYNC_IO_IN_PROGRESS; /* Let the other handler complete the request. */