Changeset 21225 in vbox

Timestamp:

Jul 5, 2009 3:20:41 PM (15 years ago)

Author:

vboxsync

Message:

Eliminated the VMMDEVHYP[PTR|PHYS]* types.

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (6 diffs)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (5 diffs)

trunk/include/VBox/VMMDev.h

@@ -47 +47 @@
  * @{
  */
-
-/** @todo The following is a temporary fix for the problem of accessing
-    hypervisor pointers from within guest additions */
-
-/** Hypervisor linear pointer size type.
- * @todo r=bird: only hypervisorStart is a "hypervisor" address, all other use
- *       is guest addresses...
- *   */
-typedef RTGCPTR32   VMMDEVHYPPTR32;
-/** Hypervisor linear pointer sized type.
- * @todo r=bird: This is never used for any "hypervisor" addresses, only guest
- *       addresses. */
-typedef RTGCPTR64   VMMDEVHYPPTR64;
-/** Hypervisor physical pointer sized type.
- * @todo r=bird: Same confusion as with VMMDEVHYPPTR64. */
-typedef RTGCPHYS32  VMMDEVHYPPHYS32;
-/** Hypervisor physical pointer sized type.
- * @todo r=bird: Same confusion as with VMMDEVHYPPTR64. */
-typedef RTGCPHYS64  VMMDEVHYPPHYS64;
-
-/** @def VMMDEVHYPPTR Hypervisor linear pointer sized type size type.
- * @todo r=bird: Same confusion as with VMMDEVHYPPTR64. */
-/** @def VMMDEVHYPPHYS Hypervisor physical pointer sized type.
- * @todo r=bird: Same confusion as with VMMDEVHYPPTR64. */
-#if defined(VBOX_WITH_64_BITS_GUESTS) && ARCH_BITS == 64
-# define VMMDEVHYPPTR   VMMDEVHYPPTR64
-# define VMMDEVHYPPHYS  VMMDEVHYPPHYS64
-# else
-# define VMMDEVHYPPTR   VMMDEVHYPPTR32
-# define VMMDEVHYPPHYS  VMMDEVHYPPHYS32
-#endif
-
 
 /** @name Mouse capability bits
@@ -399 +367 @@
     /** guest virtual address of proposed hypervisor start */
     /** TODO: Make this 64-bit compatible */
-    VMMDEVHYPPTR32 hypervisorStart;
+    RTGCPTR32 hypervisorStart;
     /** hypervisor size in bytes */
     uint32_t hypervisorSize;
@@ -745 +713 @@
             union
             {
-                VMMDEVHYPPHYS32 physAddr;
-                VMMDEVHYPPTR32  linearAddr;
+                RTGCPHYS32 physAddr;
+                RTGCPTR32  linearAddr;
             } u;
         } Pointer;
@@ -788 +756 @@
         type                    = VMMDevHGCMParmType_LinAddr;
         u.Pointer.size          = cb;
-        u.Pointer.u.linearAddr  = (VMMDEVHYPPTR32)(uintptr_t)pv;
+        u.Pointer.u.linearAddr  = (RTGCPTR32)(uintptr_t)pv;
     }
 #endif
@@ -806 +774 @@
             union
             {
-                VMMDEVHYPPHYS64 physAddr;
-                VMMDEVHYPPTR64  linearAddr;
+                RTGCPHYS64 physAddr;
+                RTGCPTR64  linearAddr;
             } u;
         } Pointer;
@@ -867 +835 @@
             union
             {
-                VMMDEVHYPPHYS32 physAddr;
-                VMMDEVHYPPTR32  linearAddr;
+                RTGCPHYS32 physAddr;
+                RTGCPTR32  linearAddr;
             } u;
         } Pointer;

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -1358 +1358 @@
             {
                 /* communicate result to VMM, align at 4MB */
-                req->hypervisorStart    = (VMMDEVHYPPTR32)(uintptr_t)RT_ALIGN_P(hypervisorArea, 0x400000);
+                req->hypervisorStart    = (RTGCPTR32)(uintptr_t)RT_ALIGN_P(hypervisorArea, 0x400000);
                 req->header.requestType = VMMDevReq_SetHypervisorInfo;
                 req->header.rc          = VERR_GENERAL_FAILURE;

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -330 +330 @@
     parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
     parms.pBuffer.u.Pointer.size         = len;
-    parms.pBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) buf;
+    parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
 
     rc = crVBoxHGCMCall(&parms, sizeof(parms));
@@ -353 +353 @@
     parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_Out;
     parms.pBuffer.u.Pointer.size         = conn->cbHostBufferAllocated;
-    parms.pBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) conn->pHostBuffer;
+    parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) conn->pHostBuffer;
 
     parms.cbBuffer.type      = VMMDevHGCMParmType_32bit;
@@ -397 +397 @@
         parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_In;
         parms.pBuffer.u.Pointer.size         = len;
-        parms.pBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) buf;
-    }
-    /*else //@todo it fails badly, have to check why
+        parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
+    }
+    /*else ///@todo it fails badly, have to check why. bird: This fails because buf isn't a physical address?
     {
         parms.pBuffer.type                 = VMMDevHGCMParmType_PhysAddr;
         parms.pBuffer.u.Pointer.size       = len;
-        parms.pBuffer.u.Pointer.u.physAddr = (VMMDEVHYPPHYS32) buf;
+        parms.pBuffer.u.Pointer.u.physAddr = (uintptr_t) buf;
     }*/
 
@@ -409 +409 @@
     parms.pWriteback.type                   = VMMDevHGCMParmType_LinAddr_Out;
     parms.pWriteback.u.Pointer.size         = conn->cbHostBufferAllocated;
-    parms.pWriteback.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) conn->pHostBuffer;
+    parms.pWriteback.u.Pointer.u.linearAddr = (uintptr_t) conn->pHostBuffer;
 
     parms.cbWriteback.type      = VMMDevHGCMParmType_32bit;
@@ -514 +514 @@
     parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_Out;
     parms.pBuffer.u.Pointer.size         = conn->cbHostBufferAllocated;
-    parms.pBuffer.u.Pointer.u.linearAddr = (VMMDEVHYPPTR) conn->pHostBuffer;
+    parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) conn->pHostBuffer;
 
     parms.cbBuffer.type      = VMMDevHGCMParmType_32bit;