Changeset 28693 in vbox

Timestamp:

Apr 24, 2010 7:14:43 PM (15 years ago)

Author:

vboxsync

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

60565

Message:

VBoxHDD/Async: Fix diff images

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -744 +744 @@
     PVBOXHDD pDisk = pIoCtx->pDisk;
 
+    LogFlowFunc(("pIoCtx=%#p\n"));
+
     if (   !pIoCtx->cbTransferLeft
-        && !pIoCtx->cMetaTransfersPending)
+        && !pIoCtx->cMetaTransfersPending
+        && !pIoCtx->pfnIoCtxTransfer)
         return VINF_VD_ASYNC_IO_FINISHED;
 
@@ -755 +758 @@
                && RT_SUCCESS(rc))
         {
+            LogFlowFunc(("calling transfer function %#p\n", pIoCtx->pfnIoCtxTransfer));
             rc = pIoCtx->pfnIoCtxTransfer(pIoCtx);
 
@@ -1229 +1233 @@
     PVDIOCTX pIoCtxParent = pIoCtx->pIoCtxParent;
 
+    LogFlowFunc(("pIoCtx=%#p\n", pIoCtx));
+
     AssertPtr(pIoCtxParent);
     Assert(!pIoCtx->cbTransferLeft && !pIoCtx->cMetaTransfersPending);
@@ -1289 +1295 @@
 static int vdWriteHelperOptimizedPreReadAsync(PVDIOCTX pIoCtx)
 {
-    pIoCtx->pfnIoCtxTransferNext = vdWriteHelperOptimizedCmpAndWriteAsync;
-    return vdReadHelperAsync(pIoCtx);
+    int rc = VINF_SUCCESS;
+
+    LogFlowFunc(("pIoCtx=%#p\n", pIoCtx));
+
+    if (pIoCtx->cbTransferLeft)
+        rc = vdReadHelperAsync(pIoCtx);
+
+    if (   RT_SUCCESS(rc)
+        && (   pIoCtx->cbTransferLeft
+            || pIoCtx->cMetaTransfersPending))
+        rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
+     else
+        pIoCtx->pfnIoCtxTransferNext = vdWriteHelperOptimizedCmpAndWriteAsync;
+
+    return rc;
 }
 
@@ -1311 +1330 @@
     size_t cbReadImage = 0;
     int rc;
+
+    LogFlowFunc(("pIoCtx=%#p\n", pIoCtx));
 
     AssertPtr(pIoCtx->pIoCtxParent);
@@ -1446 +1467 @@
                     vdIoCtxFree(pDisk, pIoCtxWrite);
 
-                    Assert(RTListIsEmpty(&pDisk->ListWriteGrowing));
                     rc = VINF_SUCCESS;
                 }