Changeset 21225 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49545

Message:

Eliminated the VMMDEVHYP[PTR|PHYS]* types.

File:

• trunk/include/VBox/VMMDev.h (modified) (6 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;