Changeset 40710 in vbox

Timestamp:

Mar 29, 2012 3:03:36 PM (13 years ago)

Author:

vboxsync

Message:

Storage/tstVDIo: Bugfixes

File:

• trunk/src/VBox/Storage/testcase/tstVDIo.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -670 +670 @@
             case 'f':
             {
-                fIgnoreFlush = true;
+                fIgnoreFlush = paScriptArgs[i].u.fFlag;
                 break;
             }
@@ -700 +700 @@
                                   NULL, fOpenFlags, pGlob->pInterfacesImages, NULL);
             else
-                rc = VDCreateDiff(pDisk->pVD, pcszBackend, pcszImage, fImageFlags, NULL, NULL, NULL, VD_OPEN_FLAGS_ASYNC_IO,
-                                  pGlob->pInterfacesImages, NULL);
+                rc = VDCreateDiff(pDisk->pVD, pcszBackend, pcszImage, fImageFlags, NULL, NULL, NULL,
+                                  fOpenFlags, pGlob->pInterfacesImages, NULL);
         }
         else
@@ -2761 +2761 @@
     RTSgBufInit(&SgBuf, &Seg, 1);
     rc = VDMemDiskWrite(pIoStorage->pFile->pMemDisk, uOffset, cbBuffer, &SgBuf);
-    if (RT_SUCCESS(rc) && pcbWritten)
+    if (RT_SUCCESS(rc))
     {
         pIoStorage->pFile->cWrites++;
-        *pcbWritten = cbBuffer;
+        if (pcbWritten)
+            *pcbWritten = cbBuffer;
     }
 
@@ -2783 +2784 @@
     RTSgBufInit(&SgBuf, &Seg, 1);
     rc = VDMemDiskRead(pIoStorage->pFile->pMemDisk, uOffset, cbBuffer, &SgBuf);
-    if (RT_SUCCESS(rc) && pcbRead)
+    if (RT_SUCCESS(rc))
     {
         pIoStorage->pFile->cReads++;
-        *pcbRead = cbBuffer;
+        if (pcbRead)
+            *pcbRead = cbBuffer;
     }