Changeset 69609 in vbox for trunk/src/VBox/Runtime/include

Timestamp:

Nov 7, 2017 6:59:38 PM (7 years ago)

Author:

vboxsync

Message:

iprt/dvm: Some API adjusting to VFS - work in progress.

File:

• trunk/src/VBox/Runtime/include/internal/dvm.h (modified) (4 diffs)

trunk/src/VBox/Runtime/include/internal/dvm.h

@@ -31 +31 @@
 #include <iprt/err.h>
 #include <iprt/assert.h>
+#include <iprt/vfs.h>
 #include "internal/magics.h"
 
@@ -55 +56 @@
 {
     /** Size of the disk in bytes. */
-    uint64_t       cbDisk;
+    uint64_t        cbDisk;
     /** Sector size. */
-    uint64_t       cbSector;
-    /** Read callback */
-    PFNDVMREAD     pfnRead;
-    /** Write callback. */
-    PFNDVMWRITE    pfnWrite;
-    /** Opaque user data. */
-    void          *pvUser;
+    uint64_t        cbSector;
+    /** The VFS file handle if backed by such. */
+    RTVFSFILE       hVfsFile;
 } RTDVMDISK;
 /** Pointer to a disk descriptor. */
@@ -294 +291 @@
     AssertReturn(off + cbRead <= pDisk->cbDisk, VERR_INVALID_PARAMETER);
 
-    return pDisk->pfnRead(pDisk->pvUser, off, pvBuf, cbRead);
+    return RTVfsFileReadAt(pDisk->hVfsFile, off, pvBuf, cbRead, NULL /*pcbRead*/);
 }
 
@@ -313 +310 @@
     AssertReturn(off + cbWrite <= pDisk->cbDisk, VERR_INVALID_PARAMETER);
 
-    return pDisk->pfnWrite(pDisk->pvUser, off, pvBuf, cbWrite);
+    return RTVfsFileWriteAt(pDisk->hVfsFile, off, pvBuf, cbWrite, NULL /*pcbWritten*/);
 }