Changeset 4111 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Aug 10, 2007 12:35:04 PM (17 years ago)

Author:

vboxsync

Message:

Extended interface for locked pointers

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (1 diff)
• PhysHeap.cpp (modified) (2 diffs)
• VBoxCalls.c (modified) (4 diffs)
• VBoxCalls.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -167 +167 @@
             for (iParm = 0; iParm < pCallInfo->cParms; iParm++, pParm++)
             {
+                if (pParm->type == VMMDevHGCMParmType_LinAddr_Locked_In)
+                    pParm->type = VMMDevHGCMParmType_LinAddr_In;
+                else
+                if (pParm->type == VMMDevHGCMParmType_LinAddr_Locked_Out)
+                    pParm->type = VMMDevHGCMParmType_LinAddr_Out;
+                else
+                if (pParm->type == VMMDevHGCMParmType_LinAddr_Locked)
+                    pParm->type = VMMDevHGCMParmType_LinAddr;
+                else
                 if (   pParm->type == VMMDevHGCMParmType_LinAddr_In
                     || pParm->type == VMMDevHGCMParmType_LinAddr_Out

trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp

@@ -53 +53 @@
 // #define DUMPHEAP
 
-#ifdef DUMPHEAP
-#define VBGL_PH_dprintf(a) AssertMsg2 a
+#if 1 //def DUMPHEAP
+#define VBGL_PH_dprintf(a) RTLogBackdoorPrintf a
 #else
 #define VBGL_PH_dprintf(a)
@@ -497 +497 @@
     }
 
+    VBGL_PH_dprintf(("VbglPhysHeapGetPhysAddr %x -> %x\n", p, physAddr));
+
     return physAddr;
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.c

@@ -393 +393 @@
 
 DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                           uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
+                           uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
     int rc = VINF_SUCCESS;
@@ -410 +410 @@
     data.cb.type                        = VMMDevHGCMParmType_32bit;
     data.cb.u.value32                   = *pcbBuffer;
-    data.buffer.type                    = VMMDevHGCMParmType_LinAddr_Out;
+    data.buffer.type                    = (fLocked) ? VMMDevHGCMParmType_LinAddr_Locked_Out : VMMDevHGCMParmType_LinAddr_Out;
     data.buffer.u.Pointer.size          = *pcbBuffer;
     data.buffer.u.Pointer.u.linearAddr  = (VBOXGCPTR)pBuffer;
@@ -428 +428 @@
 
 DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                            uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer)
+                            uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
     int rc = VINF_SUCCESS;
@@ -445 +445 @@
     data.cb.type                        = VMMDevHGCMParmType_32bit;
     data.cb.u.value32                   = *pcbBuffer;
-    data.buffer.type                    = VMMDevHGCMParmType_LinAddr_In;
+    data.buffer.type                    = (fLocked) ? VMMDevHGCMParmType_LinAddr_Locked_In : VMMDevHGCMParmType_LinAddr_In;
     data.buffer.u.Pointer.size          = *pcbBuffer;
     data.buffer.u.Pointer.u.linearAddr  = (VBOXGCPTR)pBuffer;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.h

@@ -130 +130 @@
 DECLVBGL(int) vboxCallFlush (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
 
-DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer);
-DECLVBGL(int) vboxCallWrite (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer);
+DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
+DECLVBGL(int) vboxCallWrite (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
 
 DECLVBGL(int) vboxCallLock (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);