Changeset 21225 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

Eliminated the VMMDEVHYP[PTR|PHYS]* types.

Location:

trunk/src/VBox

Files:

• Additions/linux/module/vboxmod.c (modified) (1 diff)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (5 diffs)

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;