Changeset 28065 in vbox for trunk/include/VBox

Timestamp:

Apr 7, 2010 8:54:34 PM (15 years ago)

Author:

vboxsync

Message:

Storage: Convert from PDMDATASEG to RTSGSEG to avoid casting between those two in VBoxHDD and more async I/O updates

Location:

trunk/include/VBox

Files:

• VBoxHDD.h (modified) (5 diffs)
• pdmasynccompletion.h (modified) (3 diffs)
• pdmifs.h (modified) (6 diffs)
• vscsi.h (modified) (3 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -35 +35 @@
 #include <iprt/mem.h>
 #include <iprt/net.h>
+#include <iprt/sg.h>
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
@@ -589 +590 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnReadAsync, (void *pvUser, void *pStorage, uint64_t uOffset,
-                                             PCPDMDATASEG paSegments, size_t cSegments,
+                                             PCRTSGSEG paSegments, size_t cSegments,
                                              size_t cbRead, void *pvCompletion,
                                              void **ppTask));
@@ -607 +608 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnWriteAsync, (void *pvUser, void *pStorage, uint64_t uOffset,
-                                              PCPDMDATASEG paSegments, size_t cSegments,
+                                              PCRTSGSEG paSegments, size_t cSegments,
                                               size_t cbWrite, void *pvCompletion,
                                               void **ppTask));
@@ -2188 +2189 @@
  */
 VBOXDDU_DECL(int) VDAsyncRead(PVBOXHDD pDisk, uint64_t uOffset, size_t cbRead,
-                              PPDMDATASEG paSeg, unsigned cSeg,
+                              PCRTSGSEG paSeg, unsigned cSeg,
                               PFNVDASYNCTRANSFERCOMPLETE pfnComplete,
                               void *pvUser1, void *pvUser2);
@@ -2206 +2207 @@
  */
 VBOXDDU_DECL(int) VDAsyncWrite(PVBOXHDD pDisk, uint64_t uOffset, size_t cbWrite,
-                               PPDMDATASEG paSeg, unsigned cSeg,
+                               PCRTSGSEG paSeg, unsigned cSeg,
                                PFNVDASYNCTRANSFERCOMPLETE pfnComplete,
                                void *pvUser1, void *pvUser2);

trunk/include/VBox/pdmasynccompletion.h

@@ -35 +35 @@
 #include <VBox/err.h>
 #include <iprt/assert.h>
+#include <iprt/sg.h>
 
 RT_C_DECLS_BEGIN
@@ -258 +259 @@
  */
 VMMR3DECL(int) PDMR3AsyncCompletionEpRead(PPDMASYNCCOMPLETIONENDPOINT pEndpoint, RTFOFF off,
-                                          PCPDMDATASEG paSegments, size_t cSegments,
+                                          PCRTSGSEG paSegments, unsigned cSegments,
                                           size_t cbRead, void *pvUser,
                                           PPPDMASYNCCOMPLETIONTASK ppTask);
@@ -276 +277 @@
  */
 VMMR3DECL(int) PDMR3AsyncCompletionEpWrite(PPDMASYNCCOMPLETIONENDPOINT pEndpoint, RTFOFF off,
-                                           PCPDMDATASEG paSegments, size_t cSegments,
+                                           PCRTSGSEG paSegments, unsigned cSegments,
                                            size_t cbWrite, void *pvUser,
                                            PPPDMASYNCCOMPLETIONTASK ppTask);

trunk/include/VBox/pdmifs.h

@@ -31 +31 @@
 #define ___VBox_pdmifs_h
 
+#include <iprt/sg.h>
 #include <VBox/types.h>
 #include <VBox/hgcmsvc.h>
@@ -1392 +1393 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStartRead,(PPDMIBLOCKASYNC pInterface, uint64_t off, PPDMDATASEG pSeg, unsigned cSeg, size_t cbRead, void *pvUser));
+    DECLR3CALLBACKMEMBER(int, pfnStartRead,(PPDMIBLOCKASYNC pInterface, uint64_t off, PCRTSGSEG pSeg, unsigned cSeg, size_t cbRead, void *pvUser));
 
     /**
@@ -1406 +1407 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStartWrite,(PPDMIBLOCKASYNC pInterface, uint64_t off, PPDMDATASEG pSeg, unsigned cSeg, size_t cbWrite, void *pvUser));
+    DECLR3CALLBACKMEMBER(int, pfnStartWrite,(PPDMIBLOCKASYNC pInterface, uint64_t off, PCRTSGSEG pSeg, unsigned cSeg, size_t cbWrite, void *pvUser));
 
 } PDMIBLOCKASYNC;
@@ -1455 +1456 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStartRead,(PPDMIMEDIAASYNC pInterface, uint64_t off, PPDMDATASEG pSeg, unsigned cSeg, size_t cbRead, void *pvUser));
+    DECLR3CALLBACKMEMBER(int, pfnStartRead,(PPDMIMEDIAASYNC pInterface, uint64_t off, PCRTSGSEG pSeg, unsigned cSeg, size_t cbRead, void *pvUser));
 
     /**
@@ -1469 +1470 @@
      * @thread  Any thread.
      */
-    DECLR3CALLBACKMEMBER(int, pfnStartWrite,(PPDMIMEDIAASYNC pInterface, uint64_t off, PPDMDATASEG pSeg, unsigned cSeg, size_t cbWrite, void *pvUser));
+    DECLR3CALLBACKMEMBER(int, pfnStartWrite,(PPDMIMEDIAASYNC pInterface, uint64_t off, PCRTSGSEG pSeg, unsigned cSeg, size_t cbWrite, void *pvUser));
 
 } PDMIMEDIAASYNC;
@@ -2534 +2535 @@
     uint32_t               cScatterGatherEntries;
     /** Pointer to the head of the scatter gather list. */
-    PPDMDATASEG            paScatterGatherHead;
+    PRTSGSEG               paScatterGatherHead;
     /** Size of the sense buffer. */
     uint32_t               cbSenseBuffer;

trunk/include/VBox/vscsi.h

@@ -34 +34 @@
 #include <VBox/cdefs.h>
 #include <VBox/types.h>
+#include <iprt/sg.h>
 
 RT_C_DECLS_BEGIN
@@ -222 +223 @@
                                        uint32_t iLun, uint8_t *pbCDB, size_t cbCDB,
                                        size_t cbSGList, unsigned cSGListEntries,
-                                       PPDMDATASEG paSGList, uint8_t *pbSense,
+                                       PCRTSGSEG paSGList, uint8_t *pbSense,
                                        size_t cbSense, void *pvVScsiReqUser);
 
@@ -280 +281 @@
 VBOXDDU_DECL(int) VSCSIIoReqParamsGet(VSCSIIOREQ hVScsiIoReq, uint64_t *puOffset,
                                       size_t *pcbTransfer, unsigned *pcSeg,
-                                      size_t *pcbSeg, PCPDMDATASEG *ppaSeg);
+                                      size_t *pcbSeg, PCRTSGSEG *ppaSeg);
 
 RT_C_DECLS_END