Changeset 1643 in vbox for trunk/src/VBox

Timestamp:

Mar 22, 2007 6:01:05 PM (18 years ago)

Author:

vboxsync

Message:

Hack to remove RTGCPTR from Linux guest additions

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (5 diffs)

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

@@ -324 +324 @@
                 {
                     /* We are sending data to the host or sending and reading. */
+                    void *pvR3LinAddr
+                        = (void *)VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.u.linearAddr;
                     if (copy_from_user(&pu8PointerData[offPointerData],
-                                       VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.u.linearAddr,
+                                       pvR3LinAddr,
                                        VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size))
                     {
@@ -333 +335 @@
                     }
                     VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr
-                        = &pu8PointerData[offPointerData];
+                        = (vmmDevHypPtr)&pu8PointerData[offPointerData];
                     VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size
                         = VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size;
@@ -343 +345 @@
                     /* We are reading data from the host */
                     VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr
-                        = &pu8PointerData[offPointerData];
+                        = (vmmDevHypPtr)&pu8PointerData[offPointerData];
                     VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size
                         = VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size;
@@ -371 +373 @@
                 {
                     /* We are sending data to the host or sending and reading. */
-                    if (copy_to_user(VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.u.linearAddr,
-                                     VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr,
+                    void *pvR3LinAddr
+                        = (void *)VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.u.linearAddr;
+                    void *pvR0LinAddr
+                        = (void *)VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr;
+                    if (copy_to_user(pvR3LinAddr, pvR0LinAddr,
                                      VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size))
                     {
@@ -555 +560 @@
             {
                 /* communicate result to VMM, align at 4MB */
-                req->hypervisorStart    = (RTGCPTR)ALIGNP(hypervisorArea, 0x400000);
+                req->hypervisorStart    = (vmmDevHypPtr)ALIGNP(hypervisorArea, 0x400000);
                 req->header.requestType = VMMDevReq_SetHypervisorInfo;
                 req->header.rc          = VERR_GENERAL_FAILURE;