Changeset 27476 in vbox for trunk/src/VBox

Timestamp:

Mar 18, 2010 11:13:17 AM (15 years ago)

Author:

vboxsync

Message:

VMDK: Use the I/O interface

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (14 diffs)

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

@@ -579 +579 @@
     }
     pVmdkFile->fOpen = fOpen;
+
+#ifndef VBOX_WITH_NEW_IO_CODE
     if ((pImage->uOpenFlags & VD_OPEN_FLAGS_ASYNC_IO) && (fAsyncIO))
     {
@@ -596 +598 @@
         pVmdkFile->fAsyncIO = false;
     }
+#else
+    rc = pImage->pInterfaceAsyncIOCallbacks->pfnOpen(pImage->pInterfaceAsyncIO->pvUser,
+                                                        pszFilename,
+                                                        pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY
+                                                        ? VD_INTERFACEASYNCIO_OPEN_FLAGS_READONLY
+                                                        : 0,
+                                                        NULL,
+                                                        pImage->pVDIfsDisk,
+                                                        &pVmdkFile->pStorage);
+#endif
     if (RT_SUCCESS(rc))
     {
@@ -645 +657 @@
             pImage->pFiles = pNext;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
         if (pVmdkFile->fAsyncIO)
         {
@@ -654 +667 @@
             rc = RTFileClose(pVmdkFile->File);
         }
+#else
+        rc = pImage->pInterfaceAsyncIOCallbacks->pfnClose(pImage->pInterfaceAsyncIO->pvUser,
+                                                          pVmdkFile->pStorage);
+#endif
         if (RT_SUCCESS(rc) && pVmdkFile->fDelete)
             rc = RTFileDelete(pVmdkFile->pszFilename);
@@ -673 +690 @@
     PVMDKIMAGE pImage = pVmdkFile->pImage;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
     if (pVmdkFile->fAsyncIO)
         return pImage->pInterfaceAsyncIOCallbacks->pfnReadSync(pImage->pInterfaceAsyncIO->pvUser,
@@ -679 +697 @@
     else
         return RTFileReadAt(pVmdkFile->File, uOffset, pvBuf, cbToRead, pcbRead);
+#else
+    return pImage->pInterfaceAsyncIOCallbacks->pfnReadSync(pImage->pInterfaceAsyncIO->pvUser,
+                                                               pVmdkFile->pStorage, uOffset,
+                                                               cbToRead, pvBuf, pcbRead);
+#endif
 }
 
@@ -690 +713 @@
     PVMDKIMAGE pImage = pVmdkFile->pImage;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
     if (pVmdkFile->fAsyncIO)
         return pImage->pInterfaceAsyncIOCallbacks->pfnWriteSync(pImage->pInterfaceAsyncIO->pvUser,
@@ -696 +720 @@
     else
         return RTFileWriteAt(pVmdkFile->File, uOffset, pvBuf, cbToWrite, pcbWritten);
+#else
+        return pImage->pInterfaceAsyncIOCallbacks->pfnWriteSync(pImage->pInterfaceAsyncIO->pvUser,
+                                                                pVmdkFile->pStorage, uOffset,
+                                                                cbToWrite, pvBuf, pcbWritten);
+#endif
 }
 
@@ -705 +734 @@
     PVMDKIMAGE pImage = pVmdkFile->pImage;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
     if (pVmdkFile->fAsyncIO)
     {
@@ -713 +743 @@
     else
         return RTFileGetSize(pVmdkFile->File, pcbSize);
+#else
+    return pImage->pInterfaceAsyncIOCallbacks->pfnGetSize(pImage->pInterfaceAsyncIO->pvUser,
+                                                            pVmdkFile->pStorage,
+                                                            pcbSize);
+#endif
 }
 
@@ -722 +757 @@
     PVMDKIMAGE pImage = pVmdkFile->pImage;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
     if (pVmdkFile->fAsyncIO)
     {
@@ -730 +766 @@
     else
         return RTFileSetSize(pVmdkFile->File, cbSize);
+#else
+    return pImage->pInterfaceAsyncIOCallbacks->pfnSetSize(pImage->pInterfaceAsyncIO->pvUser,
+                                                          pVmdkFile->pStorage,
+                                                          cbSize);
+#endif
 }
 
@@ -739 +780 @@
     PVMDKIMAGE pImage = pVmdkFile->pImage;
 
+#ifndef VBOX_WITH_NEW_IO_CODE
     if (pVmdkFile->fAsyncIO)
         return pImage->pInterfaceAsyncIOCallbacks->pfnFlushSync(pImage->pInterfaceAsyncIO->pvUser,
@@ -744 +786 @@
     else
         return RTFileFlush(pVmdkFile->File);
+#else
+    return pImage->pInterfaceAsyncIOCallbacks->pfnFlushSync(pImage->pInterfaceAsyncIO->pvUser,
+                                                            pVmdkFile->pStorage);
+#endif
 }