儲存庫 vbox 的更動 68654

時間撮記:

2017-9-5 下午05:22:12 (7 年 以前)

作者:

vboxsync

訊息:

VBoxGuestR0Lib: Function prefix and DECL macro cleanups.

位置:

trunk

檔案:

• include/VBox/VBoxGuestLib.h (修改) (20 筆差異)
• src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp (修改) (13 筆差異)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (修改) (4 筆差異)
• src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (修改) (1 筆差異)
• src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (修改) (3 筆差異)
• src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp (修改) (8 筆差異)
• src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp (修改) (4 筆差異)
• src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp (修改) (11 筆差異)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (修改) (4 筆差異)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp (修改) (4 筆差異)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (修改) (2 筆差異)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (修改) (53 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibCrOgl.cpp (修改) (6 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp (修改) (13 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCM.cpp (修改) (7 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp (修改) (11 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp (修改) (17 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibMouse.cpp (修改) (5 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp (修改) (6 筆差異)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibVMMDev.cpp (修改) (1 筆差異)
• src/VBox/Additions/solaris/Mouse/testcase/solaris.h (修改) (1 筆差異)
• src/VBox/Additions/solaris/Mouse/vboxms.c (修改) (6 筆差異)

trunk/include/VBox/VBoxGuestLib.h

@@ -101 +101 @@
  * @return VBox status code.
  */
-DECLR0VBGL(int) VbglInitPrimary(RTIOPORT portVMMDev, struct VMMDevMemory *pVMMDevMemory);
+DECLR0VBGL(int)     VbglR0InitPrimary(RTIOPORT portVMMDev, struct VMMDevMemory *pVMMDevMemory);
 
 /**
@@ -108 +108 @@
  * @author bird (2017-08-23)
  */
-DECLR0VBGL(void) VbglR0TerminatePrimary(void);
+DECLR0VBGL(void)    VbglR0TerminatePrimary(void);
 
 /**
@@ -116 +116 @@
  * @return VBox status code.
  */
-DECLR0VBGL(int) VbglR0InitClient(void);
+DECLR0VBGL(int)     VbglR0InitClient(void);
 
 /**
  * The library termination function.
  */
-DECLR0VBGL(void) VbglR0TerminateClient(void);
+DECLR0VBGL(void)    VbglR0TerminateClient(void);
 
 
@@ -167 +167 @@
  */
 # if defined(___VBox_VMMDev_h) || defined(DOXYGEN_RUNNING)
-DECLVBGL(int) VbglGRAlloc(struct VMMDevRequestHeader **ppReq, size_t cbReq, VMMDevRequestType enmReqType);
+DECLR0VBGL(int) VbglR0GRAlloc(struct VMMDevRequestHeader **ppReq, size_t cbReq, VMMDevRequestType enmReqType);
 # else
-DECLVBGL(int) VbglGRAlloc(struct VMMDevRequestHeader **ppReq, size_t cbReq, int32_t enmReqType);
+DECLR0VBGL(int) VbglR0GRAlloc(struct VMMDevRequestHeader **ppReq, size_t cbReq, int32_t enmReqType);
 # endif
 
@@ -179 +179 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglGRPerform(struct VMMDevRequestHeader *pReq);
+DECLR0VBGL(int) VbglR0GRPerform(struct VMMDevRequestHeader *pReq);
 
 /**
@@ -188 +188 @@
  * @return VBox status code.
  */
-DECLVBGL(void) VbglGRFree(struct VMMDevRequestHeader *pReq);
+DECLR0VBGL(void) VbglR0GRFree(struct VMMDevRequestHeader *pReq);
 
 /**
@@ -200 +200 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglGRVerify(const struct VMMDevRequestHeader *pReq, size_t cbReq);
+DECLR0VBGL(int) VbglGR0Verify(const struct VMMDevRequestHeader *pReq, size_t cbReq);
 
 /** @} */
@@ -328 +328 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMInit(void);
+DECLR0VBGL(int) VbglR0HGCMInit(void);
 
 /**
@@ -335 +335 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMTerminate(void);
+DECLR0VBGL(int) VbglR0HGCMTerminate(void);
 
 /**
@@ -349 +349 @@
  * @todo consider baking the client Id into the handle.
  */
-DECLVBGL(int) VbglR0HGCMConnect(VBGLHGCMHANDLE *pHandle, const char *pszServiceName, HGCMCLIENTID *pidClient);
+DECLR0VBGL(int) VbglR0HGCMConnect(VBGLHGCMHANDLE *pHandle, const char *pszServiceName, HGCMCLIENTID *pidClient);
 
 /**
@@ -361 +361 @@
  * @todo consider baking the client Id into the handle.
  */
-DECLVBGL(int) VbglR0HGCMDisconnect(VBGLHGCMHANDLE handle, HGCMCLIENTID idClient);
+DECLR0VBGL(int) VbglR0HGCMDisconnect(VBGLHGCMHANDLE handle, HGCMCLIENTID idClient);
 
 /**
@@ -372 +372 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMCallRaw(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
+DECLR0VBGL(int) VbglR0HGCMCallRaw(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
 
 /**
@@ -384 +384 @@
  *         or the HGCM status code (pData->Hdr.rc).
  */
-DECLVBGL(int) VbglR0HGCMCall(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
+DECLR0VBGL(int) VbglR0HGCMCall(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
 
 /**
@@ -396 +396 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMCallUserDataRaw(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
+DECLR0VBGL(int) VbglR0HGCMCallUserDataRaw(VBGLHGCMHANDLE handle, struct VBGLIOCHGCMCALL*pData, uint32_t cbData);
 
 /** @} */
@@ -403 +403 @@
  * @{ */
 typedef VBGLHGCMHANDLE VBGLCRCTLHANDLE;
-DECLVBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl);
-DECLVBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl);
-DECLVBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient);
-DECLVBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient);
+DECLR0VBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl);
+DECLR0VBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl);
+DECLR0VBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient);
+DECLR0VBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient);
 struct VBGLIOCHGCMCALL;
-DECLVBGL(int) VbglR0CrCtlConCallRaw(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
-DECLVBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
-DECLVBGL(int) VbglR0CrCtlConCallUserDataRaw(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
+DECLR0VBGL(int) VbglR0CrCtlConCallRaw(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
+DECLR0VBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
+DECLR0VBGL(int) VbglR0CrCtlConCallUserDataRaw(VBGLCRCTLHANDLE hCtl, struct VBGLIOCHGCMCALL *pCallInfo, int cbCallInfo);
 /** @} */
 
@@ -423 +423 @@
  * @returns VBox status code.
  */
-DECLVBGL(int) VbglPhysHeapInit (void);
+DECLR0VBGL(int)     VbglR0PhysHeapInit(void);
 
 /**
  * Shutdown the heap.
  */
-DECLVBGL(void) VbglPhysHeapTerminate (void);
+DECLR0VBGL(void)    VbglR0PhysHeapTerminate(void);
 
 /**
@@ -436 +436 @@
  * @param cbSize    Size of block to be allocated.
  */
-DECLVBGL(void *) VbglPhysHeapAlloc (uint32_t cbSize);
+DECLR0VBGL(void *)  VbglR0PhysHeapAlloc(uint32_t cbSize);
 
 /**
@@ -450 +450 @@
  * @returns Physical address of the memory block.
  */
-DECLVBGL(uint32_t)  VbglPhysHeapGetPhysAddr(void *pv);
+DECLR0VBGL(uint32_t) VbglR0PhysHeapGetPhysAddr(void *pv);
 
 /**
@@ -457 +457 @@
  * @param   pv    Virtual address of memory block.
  */
-DECLVBGL(void)      VbglPhysHeapFree(void *pv);
-
-DECLVBGL(int)       VbglQueryVMMDevMemory(struct VMMDevMemory **ppVMMDevMemory);
+DECLR0VBGL(void)    VbglR0PhysHeapFree(void *pv);
+
+DECLR0VBGL(int)     VbglR0QueryVMMDevMemory(struct VMMDevMemory **ppVMMDevMemory);
 DECLR0VBGL(bool)    VbglR0CanUsePhysPageList(void);
 
@@ -465 +465 @@
 /** @name Mouse
  * @{ */
-DECLVBGL(int)       VbglSetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser);
-DECLVBGL(int)       VbglGetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py);
-DECLVBGL(int)       VbglSetMouseStatus(uint32_t fFeatures);
+DECLR0VBGL(int)     VbglR0SetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser);
+DECLR0VBGL(int)     VbglR0GetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py);
+DECLR0VBGL(int)     VbglR0SetMouseStatus(uint32_t fFeatures);
 /** @}  */
 # endif /* VBOX_GUEST */

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPUtils.cpp

@@ -93 +93 @@
     VMMDevGetHeightReductionRequest *req = NULL;
 
-    rc = VbglGRAlloc((VMMDevRequestHeader**)&req, sizeof(VMMDevGetHeightReductionRequest), VMMDevReq_GetHeightReduction);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader**)&req, sizeof(VMMDevGetHeightReductionRequest), VMMDevReq_GetHeightReduction);
     if (RT_FAILURE(rc))
     {
@@ -100 +100 @@
     else
     {
-        rc = VbglGRPerform(&req->header);
+        rc = VbglR0GRPerform(&req->header);
         if (RT_SUCCESS(rc))
         {
@@ -109 +109 @@
             WARN(("ERROR querying height reduction value from VMMDev. rc = %#xrc", rc));
         }
-        VbglGRFree(&req->header);
+        VbglR0GRFree(&req->header);
     }
 
@@ -122 +122 @@
     VMMDevVideoModeSupportedRequest2 *req2 = NULL;
 
-    int rc = VbglGRAlloc((VMMDevRequestHeader**)&req2, sizeof(VMMDevVideoModeSupportedRequest2), VMMDevReq_VideoModeSupported2);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader**)&req2, sizeof(VMMDevVideoModeSupportedRequest2), VMMDevReq_VideoModeSupported2);
     if (RT_FAILURE(rc))
     {
@@ -137 +137 @@
         req2->height = height;
         req2->bpp    = bpp;
-        rc = VbglGRPerform(&req2->header);
+        rc = VbglR0GRPerform(&req2->header);
         if (RT_SUCCESS(rc))
         {
@@ -157 +157 @@
             req->bpp    = bpp;
 
-            rc = VbglGRPerform(&req->header);
+            rc = VbglR0GRPerform(&req->header);
             if (RT_SUCCESS(rc))
             {
@@ -167 +167 @@
             }
         }
-        VbglGRFree(&req2->header);
+        VbglR0GRFree(&req2->header);
     }
 
@@ -182 +182 @@
     LOGF_ENTER();
 
-    int rc = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevDisplayChangeRequest2), VMMDevReq_GetDisplayChangeRequest2);
+    int rc = VbglR0GRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevDisplayChangeRequest2), VMMDevReq_GetDisplayChangeRequest2);
 
     if (RT_FAILURE(rc))
@@ -192 +192 @@
         req->eventAck = 0;
 
-        rc = VbglGRPerform (&req->header);
+        rc = VbglR0GRPerform (&req->header);
 
         if (RT_SUCCESS(rc))
@@ -212 +212 @@
         }
 
-        VbglGRFree (&req->header);
+        VbglR0GRFree (&req->header);
     }
 
@@ -225 +225 @@
     VMMDevReqMouseStatus *req = NULL;
 
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
 
     if (RT_FAILURE(rc))
@@ -233 +233 @@
     else
     {
-        rc = VbglGRPerform(&req->header);
+        rc = VbglR0GRPerform(&req->header);
 
         if (RT_SUCCESS(rc))
@@ -257 +257 @@
         }
 
-        VbglGRFree(&req->header);
+        VbglR0GRFree(&req->header);
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -4602 +4602 @@
                     VMMDevVideoSetVisibleRegion *req = NULL;
 
-                    rc = VbglGRAlloc ((VMMDevRequestHeader **)&req,
+                    rc = VbglR0GRAlloc ((VMMDevRequestHeader **)&req,
                                       sizeof (VMMDevVideoSetVisibleRegion) + (cRects-1)*sizeof(RTRECT),
                                       VMMDevReq_VideoSetVisibleRegion);
@@ -4611 +4611 @@
                         memcpy(&req->Rect, pRect, cRects*sizeof(RTRECT));
 
-                        rc = VbglGRPerform (&req->header);
+                        rc = VbglR0GRPerform (&req->header);
                         AssertRC(rc);
                         if (RT_SUCCESS(rc))
@@ -4617 +4617 @@
                         else
                         {
-                            WARN(("VbglGRPerform failed rc (%d)", rc));
+                            WARN(("VbglR0GRPerform failed rc (%d)", rc));
                             Status = STATUS_UNSUCCESSFUL;
                         }
@@ -4623 +4623 @@
                     else
                     {
-                        WARN(("VbglGRAlloc failed rc (%d)", rc));
+                        WARN(("VbglR0GRAlloc failed rc (%d)", rc));
                         Status = STATUS_UNSUCCESSFUL;
                     }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -665 +665 @@
         if (pExt->u.primary.pvReqFlush != NULL)
         {
-            VbglGRFree((VMMDevRequestHeader *)pExt->u.primary.pvReqFlush);
+            VbglR0GRFree((VMMDevRequestHeader *)pExt->u.primary.pvReqFlush);
             pExt->u.primary.pvReqFlush = NULL;
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -465 +465 @@
 
     VMMDevVideoSetVisibleRegion *req = NULL;
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoSetVisibleRegion) + (cRects-1)*sizeof(RTRECT),
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoSetVisibleRegion) + (cRects-1)*sizeof(RTRECT),
                       VMMDevReq_VideoSetVisibleRegion);
 
@@ -472 +472 @@
         req->cRect = cRects;
         memcpy(&req->Rect, pRects, cRects*sizeof(RTRECT));
-        rc = VbglGRPerform(&req->header);
+        rc = VbglR0GRPerform(&req->header);
 
         if (RT_SUCCESS(rc))
@@ -479 +479 @@
         }
 
-        VbglGRFree(&req->header);
-    }
-    else
-    {
-        WARN(("VbglGRAlloc rc = %#xrc", rc));
+        VbglR0GRFree(&req->header);
+    }
+    else
+    {
+        WARN(("VbglR0GRAlloc rc = %#xrc", rc));
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp

@@ -201 +201 @@
         if (req)
         {
-            int rc = VbglGRPerform (&req->header);
+            int rc = VbglR0GRPerform (&req->header);
 
             if (RT_FAILURE(rc))
@@ -219 +219 @@
     VMMDevMemory *pVMMDevMemory = NULL;
 
-    rc = VbglQueryVMMDevMemory (&pVMMDevMemory);
+    rc = VbglR0QueryVMMDevMemory(&pVMMDevMemory);
     if (RT_FAILURE(rc))
     {
-        WARN(("VbglQueryVMMDevMemory rc = %#xrc", rc));
+        WARN(("VbglR0QueryVMMDevMemory rc = %#xrc", rc));
         LOGF_LEAVE();
         return rc;
@@ -252 +252 @@
         VMMDevVideoAccelFlush *req = NULL;
 
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoAccelFlush), VMMDevReq_VideoAccelFlush);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoAccelFlush), VMMDevReq_VideoAccelFlush);
 
         if (RT_SUCCESS(rc))
@@ -260 +260 @@
         else
         {
-            WARN(("VbglGRAlloc(VMMDevVideoAccelFlush) rc = %#xrc", rc));
+            WARN(("VbglR0GRAlloc(VMMDevVideoAccelFlush) rc = %#xrc", rc));
             LOGF_LEAVE();
             return rc;
@@ -269 +269 @@
 
     VMMDevVideoAccelEnable *req = NULL;
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoAccelEnable), VMMDevReq_VideoAccelEnable);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevVideoAccelEnable), VMMDevReq_VideoAccelEnable);
 
     if (RT_SUCCESS(rc))
@@ -277 +277 @@
         req->fu32Status   = 0;
 
-        rc = VbglGRPerform(&req->header);
+        rc = VbglR0GRPerform(&req->header);
         if (RT_SUCCESS(rc))
         {
@@ -306 +306 @@
                 req->fu32Status = 0;
 
-                VbglGRPerform(&req->header);
+                VbglR0GRPerform(&req->header);
 
                 rc = VERR_NOT_SUPPORTED;
@@ -316 +316 @@
         }
 
-        VbglGRFree(&req->header);
+        VbglR0GRFree(&req->header);
     }
     else
     {
-        WARN(("VbglGRAlloc(VMMDevVideoAccelEnable) rc = %#xrc", rc));
+        WARN(("VbglR0GRAlloc(VMMDevVideoAccelEnable) rc = %#xrc", rc));
     }
 

trunk/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.cpp

@@ -1465 +1465 @@
                     if (pReq)
                     {
-                        int rc = VbglGRPerform (&pReq->header);
+                        int rc = VbglR0GRPerform (&pReq->header);
                         if (RT_SUCCESS(rc))
                         {
@@ -1507 +1507 @@
                 if (pReq)
                 {
-                    int rc = VbglGRPerform(&pReq->header);
+                    int rc = VbglR0GRPerform(&pReq->header);
                     if (RT_SUCCESS(rc))
                     {
@@ -2142 +2142 @@
         VMMDevReqMouseStatus *pReq = NULL;
 
-        rcVBox = VbglGRAlloc((VMMDevRequestHeader**)&pReq, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+        rcVBox = VbglR0GRAlloc((VMMDevRequestHeader**)&pReq, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
         if (RT_SUCCESS(rcVBox))
         {
@@ -2149 +2149 @@
             pReq->pointerXPos = 0;
             pReq->pointerYPos = 0;
-            rcVBox = VbglGRPerform(&pReq->header);
+            rcVBox = VbglR0GRPerform(&pReq->header);
             if (RT_FAILURE(rcVBox))
                 Log(("VBoxMouseNT::DriverEntry: ERROR communicating new mouse capabilities to VMMDev. rc = %Rrc\n", rcVBox));

trunk/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp

@@ -111 +111 @@
     if (g_ctx.fIsNewProtEnabled)
         return true;
-    int rc = VbglSetMouseNotifyCallback(vboxNewProtMouseEventCb, NULL);
+    int rc = VbglR0SetMouseNotifyCallback(vboxNewProtMouseEventCb, NULL);
     if (RT_SUCCESS(rc))
     {
@@ -118 +118 @@
         return true;
     }
-    WARN(("VbglSetMouseNotifyCallback failed: %Rrc", rc));
+    WARN(("VbglR0SetMouseNotifyCallback failed: %Rrc", rc));
     return false;
 }
@@ -133 +133 @@
     {
         g_ctx.fIsNewProtEnabled = false;
-        int rc = VbglSetMouseNotifyCallback(NULL, NULL);
+        int rc = VbglR0SetMouseNotifyCallback(NULL, NULL);
         if (RT_FAILURE(rc))
-            WARN(("VbglSetMouseNotifyCallback failed: %Rrc", rc));
+            WARN(("VbglR0SetMouseNotifyCallback failed: %Rrc", rc));
     }
 }
@@ -202 +202 @@
     if (pDevExt->pSCReq)
     {
-        int rc = VbglGRPerform(&pDevExt->pSCReq->header);
+        int rc = VbglR0GRPerform(&pDevExt->pSCReq->header);
         if (RT_SUCCESS(rc))
         {
@@ -225 +225 @@
         else
         {
-            WARN(("VbglGRPerform failed with rc=%Rrc", rc));
+            WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
         }
     }
@@ -380 +380 @@
         {
             VMMDevReqMouseStatus *req = NULL;
-            int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+            int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
             if (RT_SUCCESS(rc))
             {
@@ -390 +390 @@
                 req->pointerYPos = 0;
 
-                rc = VbglGRPerform(&req->header);
+                rc = VbglR0GRPerform(&req->header);
                 if (RT_SUCCESS(rc))
                     InterlockedExchange(&g_ctx.fHostInformed, TRUE);
                 else
-                    WARN(("VbglGRPerform failed with rc=%Rrc", rc));
-
-                VbglGRFree(&req->header);
+                    WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
+
+                VbglR0GRFree(&req->header);
             }
             else
-                WARN(("VbglGRAlloc failed with rc=%Rrc", rc));
+                WARN(("VbglR0GRAlloc failed with rc=%Rrc", rc));
         }
 
@@ -406 +406 @@
         {
             VMMDevReqMouseStatus *req = NULL;
-            int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
+            int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_GetMouseStatus);
             if (RT_SUCCESS(rc))
                 InterlockedExchangePointer((PVOID volatile *)&pDevExt->pSCReq, req);
             else
             {
-                WARN(("VbglGRAlloc for service callback failed with rc=%Rrc", rc));
+                WARN(("VbglR0GRAlloc for service callback failed with rc=%Rrc", rc));
             }
         }
@@ -430 +430 @@
     {
         VMMDevReqMouseStatus *req = NULL;
-        int rc = VbglGRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+        int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&req, sizeof(VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
         if (RT_SUCCESS(rc))
         {
@@ -437 +437 @@
             req->pointerYPos = 0;
 
-            rc = VbglGRPerform(&req->header);
+            rc = VbglR0GRPerform(&req->header);
             if (RT_FAILURE(rc))
-                WARN(("VbglGRPerform failed with rc=%Rrc", rc));
-
-            VbglGRFree(&req->header);
+                WARN(("VbglR0GRPerform failed with rc=%Rrc", rc));
+
+            VbglR0GRFree(&req->header);
         }
         else
-            WARN(("VbglGRAlloc failed with rc=%Rrc", rc));
+            WARN(("VbglR0GRAlloc failed with rc=%Rrc", rc));
 
         InterlockedExchange(&g_ctx.fHostInformed, FALSE);
@@ -464 +464 @@
     KeReleaseSpinLock(&g_ctx.SyncLock, Irql);
     if (pSCReq)
-        VbglGRFree(&pSCReq->header);
+        VbglR0GRFree(&pSCReq->header);
 
     /*

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -441 +441 @@
 static int __init vgdrvLinuxCreateInputDevice(void)
 {
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&g_pMouseStatusReq, sizeof(*g_pMouseStatusReq), VMMDevReq_GetMouseStatus);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&g_pMouseStatusReq, sizeof(*g_pMouseStatusReq), VMMDevReq_GetMouseStatus);
     if (RT_SUCCESS(rc))
     {
@@ -479 +479 @@
         else
             rc = -ENOMEM;
-        VbglGRFree(&g_pMouseStatusReq->header);
+        VbglR0GRFree(&g_pMouseStatusReq->header);
         g_pMouseStatusReq = NULL;
     }
@@ -493 +493 @@
 static void vgdrvLinuxTermInputDevice(void)
 {
-    VbglGRFree(&g_pMouseStatusReq->header);
+    VbglR0GRFree(&g_pMouseStatusReq->header);
     g_pMouseStatusReq = NULL;
 
@@ -1031 +1031 @@
     g_pMouseStatusReq->pointerXPos = 0;
     g_pMouseStatusReq->pointerYPos = 0;
-    rc = VbglGRPerform(&g_pMouseStatusReq->header);
+    rc = VbglR0GRPerform(&g_pMouseStatusReq->header);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

@@ -486 +486 @@
                             /* Tell the VMM that we no longer support mouse pointer integration. */
                             VMMDevReqMouseStatus *pReq = NULL;
-                            int vrc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReqMouseStatus),
+                            int vrc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReqMouseStatus),
                                                   VMMDevReq_SetMouseStatus);
                             if (RT_SUCCESS(vrc))
@@ -494 +494 @@
                                 pReq->pointerYPos = 0;
 
-                                vrc = VbglGRPerform(&pReq->header);
+                                vrc = VbglR0GRPerform(&pReq->header);
                                 if (RT_FAILURE(vrc))
                                 {
@@ -500 +500 @@
                                 }
 
-                                VbglGRFree(&pReq->header);
+                                VbglR0GRFree(&pReq->header);
                             }
 
@@ -523 +523 @@
                                     pReq->powerState = VMMDevPowerState_PowerOff;
 
-                                    vrc = VbglGRPerform(&pReq->header);
+                                    vrc = VbglR0GRPerform(&pReq->header);
                                 }
                                 if (RT_FAILURE(vrc))

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -451 +451 @@
     if (NT_SUCCESS(rcNt))
     {
-        int vrc = VbglGRAlloc((VMMDevRequestHeader **)&pDevExt->pPowerStateRequest,
+        int vrc = VbglR0GRAlloc((VMMDevRequestHeader **)&pDevExt->pPowerStateRequest,
                               sizeof(VMMDevPowerStateRequest), VMMDevReq_SetPowerStatus);
         if (RT_FAILURE(vrc))
@@ -942 +942 @@
         pReq->powerState = VMMDevPowerState_PowerOff;
 
-        int rc = VbglGRPerform(&pReq->header);
+        int rc = VbglR0GRPerform(&pReq->header);
         if (RT_FAILURE(rc))
             LogFunc(("Error performing request to VMMDev, rc=%Rrc\n", rc));

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -152 +152 @@
      */
     VMMDevReqHypervisorInfo *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqHypervisorInfo), VMMDevReq_GetHypervisorInfo);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqHypervisorInfo), VMMDevReq_GetHypervisorInfo);
     if (RT_FAILURE(rc))
         return rc;
     pReq->hypervisorStart = 0;
     pReq->hypervisorSize  = 0;
-    rc = VbglGRPerform(&pReq->header);
+    rc = VbglR0GRPerform(&pReq->header);
     if (RT_FAILURE(rc)) /* this shouldn't happen! */
     {
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
         return rc;
     }
@@ -242 +242 @@
             AssertMsg(RT_ALIGN_32(pReq->hypervisorStart, _4M) == pReq->hypervisorStart, ("%#x\n", pReq->hypervisorStart));
 
-            rc = VbglGRPerform(&pReq->header);
+            rc = VbglR0GRPerform(&pReq->header);
             if (RT_SUCCESS(rc))
             {
@@ -266 +266 @@
             LogRel(("VBoxGuest: Warning: failed to reserve %#d of memory for guest mappings.\n", cbHypervisor));
     }
-    VbglGRFree(&pReq->header);
+    VbglR0GRFree(&pReq->header);
 
     /*
@@ -289 +289 @@
          */
         VMMDevReqHypervisorInfo *pReq;
-        int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqHypervisorInfo), VMMDevReq_SetHypervisorInfo);
+        int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevReqHypervisorInfo), VMMDevReq_SetHypervisorInfo);
         if (RT_SUCCESS(rc))
         {
             pReq->hypervisorStart = 0;
             pReq->hypervisorSize  = 0;
-            rc = VbglGRPerform(&pReq->header);
-            VbglGRFree(&pReq->header);
+            rc = VbglR0GRPerform(&pReq->header);
+            VbglR0GRFree(&pReq->header);
         }
         if (RT_SUCCESS(rc))
@@ -324 +324 @@
     VMMDevReportGuestInfo2 *pReqInfo2 = NULL;
     VMMDevReportGuestInfo  *pReqInfo1 = NULL;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReqInfo2, sizeof (VMMDevReportGuestInfo2), VMMDevReq_ReportGuestInfo2);
-    Log(("vgdrvReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReqInfo2, sizeof (VMMDevReportGuestInfo2), VMMDevReq_ReportGuestInfo2);
+    Log(("vgdrvReportGuestInfo: VbglR0GRAlloc VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
     if (RT_SUCCESS(rc))
     {
@@ -335 +335 @@
         RTStrCopy(pReqInfo2->guestInfo.szName, sizeof(pReqInfo2->guestInfo.szName), VBOX_VERSION_STRING);
 
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReqInfo1, sizeof (VMMDevReportGuestInfo), VMMDevReq_ReportGuestInfo);
-        Log(("vgdrvReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReqInfo1, sizeof (VMMDevReportGuestInfo), VMMDevReq_ReportGuestInfo);
+        Log(("vgdrvReportGuestInfo: VbglR0GRAlloc VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
         if (RT_SUCCESS(rc))
         {
@@ -350 +350 @@
              * if not supported by the VMMDev (message ordering requirement).
              */
-            rc = VbglGRPerform(&pReqInfo2->header);
-            Log(("vgdrvReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
+            rc = VbglR0GRPerform(&pReqInfo2->header);
+            Log(("vgdrvReportGuestInfo: VbglR0GRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
             if (RT_SUCCESS(rc))
             {
-                rc = VbglGRPerform(&pReqInfo1->header);
-                Log(("vgdrvReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+                rc = VbglR0GRPerform(&pReqInfo1->header);
+                Log(("vgdrvReportGuestInfo: VbglR0GRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
             }
             else if (   rc == VERR_NOT_SUPPORTED
                      || rc == VERR_NOT_IMPLEMENTED)
             {
-                rc = VbglGRPerform(&pReqInfo1->header);
-                Log(("vgdrvReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
+                rc = VbglR0GRPerform(&pReqInfo1->header);
+                Log(("vgdrvReportGuestInfo: VbglR0GRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
                 if (RT_SUCCESS(rc))
                 {
-                    rc = VbglGRPerform(&pReqInfo2->header);
-                    Log(("vgdrvReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
+                    rc = VbglR0GRPerform(&pReqInfo2->header);
+                    Log(("vgdrvReportGuestInfo: VbglR0GRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
                     if (rc == VERR_NOT_IMPLEMENTED)
                         rc = VINF_SUCCESS;
                 }
             }
-            VbglGRFree(&pReqInfo1->header);
-        }
-        VbglGRFree(&pReqInfo2->header);
+            VbglR0GRFree(&pReqInfo1->header);
+        }
+        VbglR0GRFree(&pReqInfo2->header);
     }
 
@@ -391 +391 @@
      */
     VMMDevReportGuestStatus *pReq2 = NULL;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq2, sizeof(*pReq2), VMMDevReq_ReportGuestStatus);
-    Log(("vgdrvReportDriverStatus: VbglGRAlloc VMMDevReportGuestStatus completed with rc=%Rrc\n", rc));
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq2, sizeof(*pReq2), VMMDevReq_ReportGuestStatus);
+    Log(("vgdrvReportDriverStatus: VbglR0GRAlloc VMMDevReportGuestStatus completed with rc=%Rrc\n", rc));
     if (RT_SUCCESS(rc))
     {
@@ -400 +400 @@
                                   : VBoxGuestFacilityStatus_Inactive;
         pReq2->guestStatus.flags = 0;
-        rc = VbglGRPerform(&pReq2->header);
-        Log(("vgdrvReportDriverStatus: VbglGRPerform VMMDevReportGuestStatus completed with fActive=%d, rc=%Rrc\n",
+        rc = VbglR0GRPerform(&pReq2->header);
+        Log(("vgdrvReportDriverStatus: VbglR0GRPerform VMMDevReportGuestStatus completed with fActive=%d, rc=%Rrc\n",
              fActive ? 1 : 0, rc));
         if (rc == VERR_NOT_IMPLEMENTED) /* Compatibility with older hosts. */
             rc = VINF_SUCCESS;
-        VbglGRFree(&pReq2->header);
+        VbglR0GRFree(&pReq2->header);
     }
 
@@ -440 +440 @@
     pReq->cPages = VMMDEV_MEMORY_BALLOON_CHUNK_PAGES;
 
-    rc = VbglGRPerform(&pReq->header);
+    rc = VbglR0GRPerform(&pReq->header);
     if (RT_FAILURE(rc))
-        LogRel(("vgdrvBalloonInflate: VbglGRPerform failed. rc=%Rrc\n", rc));
+        LogRel(("vgdrvBalloonInflate: VbglR0GRPerform failed. rc=%Rrc\n", rc));
     return rc;
 }
@@ -472 +472 @@
     pReq->cPages = VMMDEV_MEMORY_BALLOON_CHUNK_PAGES;
 
-    rc = VbglGRPerform(&pReq->header);
+    rc = VbglR0GRPerform(&pReq->header);
     if (RT_FAILURE(rc))
     {
-        LogRel(("vgdrvBalloonDeflate: VbglGRPerform failed. rc=%Rrc\n", rc));
+        LogRel(("vgdrvBalloonDeflate: VbglR0GRPerform failed. rc=%Rrc\n", rc));
         return rc;
     }
@@ -532 +532 @@
         }
 
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
         if (RT_FAILURE(rc))
             return rc;
@@ -585 +585 @@
         }
 
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
 
@@ -681 +681 @@
      * Try inflate / default the balloon as requested.
      */
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
     if (RT_FAILURE(rc))
         return rc;
@@ -711 +711 @@
     }
 
-    VbglGRFree(&pReq->header);
+    VbglR0GRFree(&pReq->header);
     return rc;
 }
@@ -734 +734 @@
         {
             VMMDevChangeMemBalloon *pReq;
-            int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
+            int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, g_cbChangeMemBalloonReq, VMMDevReq_ChangeMemBalloon);
             if (RT_SUCCESS(rc))
             {
@@ -750 +750 @@
                     pDevExt->MemBalloon.cChunks--;
                 }
-                VbglGRFree(&pReq->header);
+                VbglR0GRFree(&pReq->header);
             }
             else
@@ -782 +782 @@
     if (pDevExt->pReqGuestHeartbeat)
     {
-        rc = VbglGRPerform(pDevExt->pReqGuestHeartbeat);
-        Log3(("vgdrvHeartbeatSend: VbglGRPerform vgdrvHeartbeatSend completed with rc=%Rrc\n", rc));
+        rc = VbglR0GRPerform(pDevExt->pReqGuestHeartbeat);
+        Log3(("vgdrvHeartbeatSend: VbglR0GRPerform vgdrvHeartbeatSend completed with rc=%Rrc\n", rc));
     }
     else
@@ -819 +819 @@
 {
     VMMDevReqHeartbeat *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_HeartbeatConfigure);
-    Log(("vgdrvHeartbeatHostConfigure: VbglGRAlloc vgdrvHeartbeatHostConfigure completed with rc=%Rrc\n", rc));
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_HeartbeatConfigure);
+    Log(("vgdrvHeartbeatHostConfigure: VbglR0GRAlloc vgdrvHeartbeatHostConfigure completed with rc=%Rrc\n", rc));
     if (RT_SUCCESS(rc))
     {
         pReq->fEnabled = fEnabled;
         pReq->cNsInterval = 0;
-        rc = VbglGRPerform(&pReq->header);
-        Log(("vgdrvHeartbeatHostConfigure: VbglGRPerform vgdrvHeartbeatHostConfigure completed with rc=%Rrc\n", rc));
+        rc = VbglR0GRPerform(&pReq->header);
+        Log(("vgdrvHeartbeatHostConfigure: VbglR0GRPerform vgdrvHeartbeatHostConfigure completed with rc=%Rrc\n", rc));
         pDevExt->cNsHeartbeatInterval = pReq->cNsInterval;
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
     return rc;
@@ -855 +855 @@
             /*
              * Preallocate the request to use it from the timer callback because:
-             *    1) on Windows VbglGRAlloc must be called at IRQL <= APC_LEVEL
+             *    1) on Windows VbglR0GRAlloc must be called at IRQL <= APC_LEVEL
              *       and the timer callback runs at DISPATCH_LEVEL;
              *    2) avoid repeated allocations.
              */
-            rc = VbglGRAlloc(&pDevExt->pReqGuestHeartbeat, sizeof(*pDevExt->pReqGuestHeartbeat), VMMDevReq_GuestHeartbeat);
+            rc = VbglR0GRAlloc(&pDevExt->pReqGuestHeartbeat, sizeof(*pDevExt->pReqGuestHeartbeat), VMMDevReq_GuestHeartbeat);
             if (RT_SUCCESS(rc))
             {
@@ -877 +877 @@
                     LogRel(("vgdrvHeartbeatInit: Failed to create heartbeat timer: %Rrc\n", rc));
 
-                VbglGRFree(pDevExt->pReqGuestHeartbeat);
+                VbglR0GRFree(pDevExt->pReqGuestHeartbeat);
                 pDevExt->pReqGuestHeartbeat = NULL;
             }
             else
-                LogRel(("vgdrvHeartbeatInit: VbglGRAlloc(VMMDevReq_GuestHeartbeat): %Rrc\n", rc));
+                LogRel(("vgdrvHeartbeatInit: VbglR0GRAlloc(VMMDevReq_GuestHeartbeat): %Rrc\n", rc));
 
             LogRel(("vgdrvHeartbeatInit: Failed to set up the timer, guest heartbeat is disabled\n"));
@@ -1063 +1063 @@
      * made by the VMM.
      */
-    rc = VbglInitPrimary(pDevExt->IOPortBase, (VMMDevMemory *)pDevExt->pVMMDevMemory);
+    rc = VbglR0InitPrimary(pDevExt->IOPortBase, (VMMDevMemory *)pDevExt->pVMMDevMemory);
     if (RT_SUCCESS(rc))
     {
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pDevExt->pIrqAckEvents, sizeof(VMMDevEvents), VMMDevReq_AcknowledgeEvents);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pDevExt->pIrqAckEvents, sizeof(VMMDevEvents), VMMDevReq_AcknowledgeEvents);
         if (RT_SUCCESS(rc))
         {
-            pDevExt->PhysIrqAckEvents = VbglPhysHeapGetPhysAddr(pDevExt->pIrqAckEvents);
+            pDevExt->PhysIrqAckEvents = VbglR0PhysHeapGetPhysAddr(pDevExt->pIrqAckEvents);
             Assert(pDevExt->PhysIrqAckEvents != 0);
 
@@ -1113 +1113 @@
             }
             else
-                LogRel(("VGDrvCommonInitDevExt: VBoxReportGuestInfo failed: rc=%Rrc\n", rc));
-            VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
+                LogRel(("VGDrvCommonInitDevExt: vgdrvReportGuestInfo failed: rc=%Rrc\n", rc));
+            VbglR0GRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
         }
         else
-            LogRel(("VGDrvCommonInitDevExt: VBoxGRAlloc failed: rc=%Rrc\n", rc));
+            LogRel(("VGDrvCommonInitDevExt: VbglR0GRAlloc failed: rc=%Rrc\n", rc));
 
         VbglR0TerminatePrimary();
     }
     else
-        LogRel(("VGDrvCommonInitDevExt: VbglInit failed: rc=%Rrc\n", rc));
+        LogRel(("VGDrvCommonInitDevExt: VbglR0InitPrimary failed: rc=%Rrc\n", rc));
 
     rc2 = RTSemFastMutexDestroy(pDevExt->MemBalloon.hMtx); AssertRC(rc2);
@@ -1180 +1180 @@
     }
 
-    VbglGRFree(pDevExt->pReqGuestHeartbeat);
+    VbglR0GRFree(pDevExt->pReqGuestHeartbeat);
     pDevExt->pReqGuestHeartbeat = NULL;
 
@@ -2092 +2092 @@
         return VERR_INVALID_PARAMETER;
     }
-    rc = VbglGRVerify(pReqHdr, cbData);
+    rc = VbglGR0Verify(pReqHdr, cbData);
     if (RT_FAILURE(rc))
     {
@@ -2114 +2114 @@
      * it does makes things a bit simpler wrt to phys address.)
      */
-    rc = VbglGRAlloc(&pReqCopy, cbReq, enmType);
+    rc = VbglR0GRAlloc(&pReqCopy, cbReq, enmType);
     if (RT_FAILURE(rc))
     {
@@ -2128 +2128 @@
         pSession->u32MousePosChangedSeq = ASMAtomicUoReadU32(&pDevExt->u32MousePosChangedSeq);
 
-    rc = VbglGRPerform(pReqCopy);
+    rc = VbglR0GRPerform(pReqCopy);
     if (   RT_SUCCESS(rc)
         && RT_SUCCESS(pReqCopy->rc))
@@ -2139 +2139 @@
     }
     else if (RT_FAILURE(rc))
-        Log(("VBOXGUEST_IOCTL_VMMREQUEST: VbglGRPerform - rc=%Rrc!\n", rc));
+        Log(("VBOXGUEST_IOCTL_VMMREQUEST: VbglR0GRPerform - rc=%Rrc!\n", rc));
     else
     {
@@ -2146 +2146 @@
     }
 
-    VbglGRFree(pReqCopy);
+    VbglR0GRFree(pReqCopy);
     return rc;
 }
@@ -2472 +2472 @@
     if (pDevExt->MemBalloon.pOwner == pSession)
     {
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevGetMemBalloonChangeRequest), VMMDevReq_GetMemBalloonChangeRequest);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(VMMDevGetMemBalloonChangeRequest), VMMDevReq_GetMemBalloonChangeRequest);
         if (RT_SUCCESS(rc))
         {
@@ -2481 +2481 @@
              */
             pReq->eventAck = VMMDEV_EVENT_BALLOON_CHANGE_REQUEST;
-            rc = VbglGRPerform(&pReq->header);
+            rc = VbglR0GRPerform(&pReq->header);
             if (RT_SUCCESS(rc))
             {
@@ -2501 +2501 @@
             }
             else
-                LogRel(("VBGL_IOCTL_CHECK_BALLOON: VbglGRPerform failed. rc=%Rrc\n", rc));
-            VbglGRFree(&pReq->header);
+                LogRel(("VBGL_IOCTL_CHECK_BALLOON: VbglR0GRPerform failed. rc=%Rrc\n", rc));
+            VbglR0GRFree(&pReq->header);
         }
     }
@@ -2586 +2586 @@
     RT_NOREF1(pDevExt);
 
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_WriteCoreDump);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_WriteCoreDump);
     if (RT_SUCCESS(rc))
     {
         pReq->fFlags = pInfo->u.In.fFlags;
-        rc = VbglGRPerform(&pReq->header);
+        rc = VbglR0GRPerform(&pReq->header);
         if (RT_FAILURE(rc))
-            Log(("VBOXGUEST_IOCTL_WRITE_CORE_DUMP: VbglGRPerform failed, rc=%Rrc!\n", rc));
-
-        VbglGRFree(&pReq->header);
+            Log(("VBOXGUEST_IOCTL_WRITE_CORE_DUMP: VbglR0GRPerform failed, rc=%Rrc!\n", rc));
+
+        VbglR0GRFree(&pReq->header);
     }
     else
@@ -2741 +2741 @@
 {
     VMMDevCtlGuestFilterMask *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
     if (RT_SUCCESS(rc))
     {
         pReq->u32NotMask = UINT32_MAX & ~fFixedEvents;
         pReq->u32OrMask  = fFixedEvents;
-        rc = VbglGRPerform(&pReq->header);
+        rc = VbglR0GRPerform(&pReq->header);
         if (RT_FAILURE(rc))
             LogRelFunc(("failed with rc=%Rrc\n", rc));
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
     RT_NOREF1(pDevExt);
@@ -2785 +2785 @@
      * Preallocate a request buffer so we can do all in one go without leaving the spinlock.
      */
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_CtlGuestFilterMask);
     if (RT_SUCCESS(rc))
     { /* nothing */ }
     else if (!fSessionTermination)
     {
-        LogRel(("vgdrvSetSessionFilterMask: VbglGRAlloc failure: %Rrc\n", rc));
+        LogRel(("vgdrvSetSessionFilterMask: VbglR0GRAlloc failure: %Rrc\n", rc));
         return rc;
     }
@@ -2832 +2832 @@
                     pDevExt->fEventFilterHost = pReq->u32OrMask;
                     pReq->u32NotMask = ~pReq->u32OrMask;
-                    rc = VbglGRPerform(&pReq->header);
+                    rc = VbglR0GRPerform(&pReq->header);
                     if (RT_FAILURE(rc))
                     {
@@ -2855 +2855 @@
     RTSpinlockRelease(pDevExt->SessionSpinlock);
     if (pReq)
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     return rc;
 }
@@ -2892 +2892 @@
 {
     VMMDevReqMouseStatus *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus);
     if (RT_SUCCESS(rc))
     {
@@ -2898 +2898 @@
         pReq->pointerXPos   = 0;
         pReq->pointerYPos   = 0;
-        rc = VbglGRPerform(&pReq->header);
+        rc = VbglR0GRPerform(&pReq->header);
         if (RT_FAILURE(rc))
             LogRelFunc(("failed with rc=%Rrc\n", rc));
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
     RT_NOREF1(pDevExt);
@@ -2937 +2937 @@
      * Preallocate a request buffer so we can do all in one go without leaving the spinlock.
      */
-    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus);
+    rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetMouseStatus);
     if (RT_SUCCESS(rc))
     { /* nothing */ }
     else if (!fSessionTermination)
     {
-        LogRel(("vgdrvSetSessionMouseStatus: VbglGRAlloc failure: %Rrc\n", rc));
+        LogRel(("vgdrvSetSessionMouseStatus: VbglR0GRAlloc failure: %Rrc\n", rc));
         return rc;
     }
@@ -2983 +2983 @@
                     pReq->pointerXPos = 0;
                     pReq->pointerYPos = 0;
-                    rc = VbglGRPerform(&pReq->header);
+                    rc = VbglR0GRPerform(&pReq->header);
                     if (RT_FAILURE(rc))
                     {
@@ -3006 +3006 @@
     RTSpinlockRelease(pDevExt->SessionSpinlock);
     if (pReq)
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     return rc;
 }
@@ -3090 +3090 @@
 {
     VMMDevReqGuestCapabilities2 *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
     if (RT_SUCCESS(rc))
     {
         pReq->u32NotMask = UINT32_MAX;
         pReq->u32OrMask  = 0;
-        rc = VbglGRPerform(&pReq->header);
+        rc = VbglR0GRPerform(&pReq->header);
 
         if (RT_FAILURE(rc))
             LogRelFunc(("failed with rc=%Rrc\n", rc));
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
     RT_NOREF1(pDevExt);
@@ -3127 +3127 @@
         pDevExt->fGuestCapsHost = pReq->u32OrMask;
         pReq->u32NotMask = ~pReq->u32OrMask;
-        rc = VbglGRPerform(&pReq->header);
+        rc = VbglR0GRPerform(&pReq->header);
         if (RT_FAILURE(rc))
             pDevExt->fGuestCapsHost = UINT32_MAX;
@@ -3203 +3203 @@
     if (!(fFlags & VBGL_IOC_AGC_FLAGS_CONFIG_ACQUIRE_MODE))
     {
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
         if (RT_SUCCESS(rc))
         { /* do nothing */ }
         else if (!fSessionTermination)
         {
-            LogRel(("vgdrvAcquireSessionCapabilities: pSession=%p fOrMask=%#x fNotMask=%#x fFlags=%#x: VbglGRAlloc failure: %Rrc\n",
+            LogRel(("vgdrvAcquireSessionCapabilities: pSession=%p fOrMask=%#x fNotMask=%#x fFlags=%#x: VbglR0GRAlloc failure: %Rrc\n",
                     pSession, fOrMask, fNotMask, fFlags, rc));
             return rc;
@@ -3231 +3231 @@
 
         if (pReq)
-            VbglGRFree(&pReq->header);
+            VbglR0GRFree(&pReq->header);
         AssertMsgFailed(("Trying to change caps mode: %#x\n", fOrMask));
         LogRel(("vgdrvAcquireSessionCapabilities: pSession=%p fOrMask=%#x fNotMask=%#x fFlags=%#x: calling caps acquire for set caps\n",
@@ -3303 +3303 @@
                     RTSpinlockRelease(pDevExt->EventSpinlock);
                     LogRel(("vgdrvAcquireSessionCapabilities: vgdrvUpdateCapabilitiesOnHostWithReqAndLock failed: rc=%Rrc\n", rc));
-                    VbglGRFree(&pReq->header);
+                    VbglR0GRFree(&pReq->header);
                     return rc;
                 }
@@ -3314 +3314 @@
 
         Log(("vgdrvAcquireSessionCapabilities: Caps %#x were busy\n", fOtherConflictingCaps));
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
         return VERR_RESOURCE_BUSY;
     }
@@ -3320 +3320 @@
     RTSpinlockRelease(pDevExt->EventSpinlock);
     if (pReq)
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
 
     /*
@@ -3403 +3403 @@
      */
     VMMDevReqGuestCapabilities2 *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
     if (RT_SUCCESS(rc))
     { /* nothing */ }
@@ -3412 +3412 @@
         if (pfGlobalCaps)
             *pfGlobalCaps  = UINT32_MAX;
-        LogRel(("vgdrvSetSessionCapabilities: VbglGRAlloc failure: %Rrc\n", rc));
+        LogRel(("vgdrvSetSessionCapabilities: VbglR0GRAlloc failure: %Rrc\n", rc));
         return rc;
     }
@@ -3479 +3479 @@
     RTSpinlockRelease(pDevExt->SessionSpinlock);
     if (pReq)
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     return rc;
 }
@@ -3911 +3911 @@
         /*
          * Acknowlegde events.
-         * We don't use VbglGRPerform here as it may take another spinlocks.
+         * We don't use VbglR0GRPerform here as it may take another spinlocks.
          */
         pReq->header.rc = VERR_INTERNAL_ERROR;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibCrOgl.cpp

@@ -37 +37 @@
 
 
-DECLVBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl)
+DECLR0VBGL(int) VbglR0CrCtlCreate(VBGLCRCTLHANDLE *phCtl)
 {
     int rc;
@@ -69 +69 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl)
+DECLR0VBGL(int) VbglR0CrCtlDestroy(VBGLCRCTLHANDLE hCtl)
 {
     VbglR0IdcClose(&hCtl->IdcHandle);
@@ -78 +78 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient)
+DECLR0VBGL(int) VbglR0CrCtlConConnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID *pidClient)
 {
     VBGLIOCHGCMCONNECT info;
@@ -103 +103 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient)
+DECLR0VBGL(int) VbglR0CrCtlConDisconnect(VBGLCRCTLHANDLE hCtl, HGCMCLIENTID idClient)
 {
     VBGLIOCHGCMDISCONNECT info;
@@ -111 +111 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConCallRaw(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
+DECLR0VBGL(int) VbglR0CrCtlConCallRaw(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
 {
     return VbglR0IdcCallRaw(&hCtl->IdcHandle, VBGL_IOCTL_HGCM_CALL(cbCallInfo), &pCallInfo->Hdr, cbCallInfo);
 }
 
-DECLVBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
+DECLR0VBGL(int) VbglR0CrCtlConCall(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
 {
     int rc = VbglR0IdcCallRaw(&hCtl->IdcHandle, VBGL_IOCTL_HGCM_CALL(cbCallInfo), &pCallInfo->Hdr, cbCallInfo);
@@ -124 +124 @@
 }
 
-DECLVBGL(int) VbglR0CrCtlConCallUserDataRaw(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
+DECLR0VBGL(int) VbglR0CrCtlConCallUserDataRaw(VBGLCRCTLHANDLE hCtl, PVBGLIOCHGCMCALL pCallInfo, int cbCallInfo)
 {
     return VbglR0IdcCallRaw(&hCtl->IdcHandle, VBGL_IOCTL_HGCM_CALL_WITH_USER_DATA(cbCallInfo), &pCallInfo->Hdr, cbCallInfo);

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibGenericRequest.cpp

@@ -36 +36 @@
 
 
-DECLVBGL(int) VbglGRVerify(const VMMDevRequestHeader *pReq, size_t cbReq)
+DECLR0VBGL(int) VbglGR0Verify(const VMMDevRequestHeader *pReq, size_t cbReq)
 {
     size_t cbReqExpected;
@@ -42 +42 @@
     if (RT_UNLIKELY(!pReq || cbReq < sizeof(VMMDevRequestHeader)))
     {
-        dprintf(("VbglGRVerify: Invalid parameter: pReq = %p, cbReq = %zu\n", pReq, cbReq));
+        dprintf(("VbglGR0Verify: Invalid parameter: pReq = %p, cbReq = %zu\n", pReq, cbReq));
         return VERR_INVALID_PARAMETER;
     }
@@ -48 +48 @@
     if (RT_UNLIKELY(pReq->size > cbReq))
     {
-        dprintf(("VbglGRVerify: request size %u > buffer size %zu\n", pReq->size, cbReq));
+        dprintf(("VbglGR0Verify: request size %u > buffer size %zu\n", pReq->size, cbReq));
         return VERR_INVALID_PARAMETER;
     }
@@ -56 +56 @@
     if (RT_UNLIKELY(cbReq < cbReqExpected))
     {
-        dprintf(("VbglGRVerify: buffer size %zu < expected size %zu\n", cbReq, cbReqExpected));
+        dprintf(("VbglGR0Verify: buffer size %zu < expected size %zu\n", cbReq, cbReqExpected));
         return VERR_INVALID_PARAMETER;
     }
@@ -68 +68 @@
         if (RT_UNLIKELY(pReq->size != cbReqExpected))
         {
-            dprintf(("VbglGRVerify: request size %u != expected size %zu\n", pReq->size, cbReqExpected));
+            dprintf(("VbglGR0Verify: request size %u != expected size %zu\n", pReq->size, cbReqExpected));
             return VERR_INVALID_PARAMETER;
         }
@@ -96 +96 @@
         if (RT_UNLIKELY(cbReq > VMMDEV_MAX_VMMDEVREQ_SIZE))
         {
-            dprintf(("VbglGRVerify: VMMDevReq_LogString: buffer size %zu too big\n", cbReq));
+            dprintf(("VbglGR0Verify: VMMDevReq_LogString: buffer size %zu too big\n", cbReq));
             return VERR_BUFFER_OVERFLOW; /** @todo is this error code ok? */
         }
@@ -102 +102 @@
     else
     {
-        dprintf(("VbglGRVerify: request size %u > buffer size %zu\n", pReq->size, cbReq));
+        dprintf(("VbglGR0Verify: request size %u > buffer size %zu\n", pReq->size, cbReq));
         return VERR_IO_BAD_LENGTH; /** @todo is this error code ok? */
     }
@@ -109 +109 @@
 }
 
-DECLVBGL(int) VbglGRAlloc(VMMDevRequestHeader **ppReq, size_t cbReq, VMMDevRequestType enmReqType)
+DECLR0VBGL(int) VbglR0GRAlloc(VMMDevRequestHeader **ppReq, size_t cbReq, VMMDevRequestType enmReqType)
 {
     int rc = vbglR0Enter();
@@ -118 +118 @@
             && cbReq == (uint32_t)cbReq)
         {
-            VMMDevRequestHeader *pReq = (VMMDevRequestHeader *)VbglPhysHeapAlloc((uint32_t)cbReq);
-            AssertMsgReturn(pReq, ("VbglGRAlloc: no memory (cbReq=%u)\n", cbReq), VERR_NO_MEMORY);
+            VMMDevRequestHeader *pReq = (VMMDevRequestHeader *)VbglR0PhysHeapAlloc((uint32_t)cbReq);
+            AssertMsgReturn(pReq, ("VbglR0GRAlloc: no memory (cbReq=%u)\n", cbReq), VERR_NO_MEMORY);
             memset(pReq, 0xAA, cbReq);
 
@@ -134 +134 @@
         else
         {
-            dprintf(("VbglGRAlloc: Invalid parameter: ppReq=%p cbReq=%u\n", ppReq, cbReq));
+            dprintf(("VbglR0GRAlloc: Invalid parameter: ppReq=%p cbReq=%u\n", ppReq, cbReq));
             rc = VERR_INVALID_PARAMETER;
         }
@@ -141 +141 @@
 }
 
-DECLVBGL(int) VbglGRPerform(VMMDevRequestHeader *pReq)
+DECLR0VBGL(int) VbglR0GRPerform(VMMDevRequestHeader *pReq)
 {
     int rc = vbglR0Enter();
@@ -148 +148 @@
         if (pReq)
         {
-            RTCCPHYS PhysAddr = VbglPhysHeapGetPhysAddr(pReq);
+            RTCCPHYS PhysAddr = VbglR0PhysHeapGetPhysAddr(pReq);
             if (   PhysAddr != 0
                 && PhysAddr < _4G) /* Port IO is 32 bit. */
@@ -166 +166 @@
 }
 
-DECLVBGL(void) VbglGRFree(VMMDevRequestHeader *pReq)
+DECLR0VBGL(void) VbglR0GRFree(VMMDevRequestHeader *pReq)
 {
     int rc = vbglR0Enter();
     if (RT_SUCCESS(rc))
-        VbglPhysHeapFree(pReq);
+        VbglR0PhysHeapFree(pReq);
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCM.cpp

@@ -64 +64 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMInit(void)
+DECLR0VBGL(int) VbglR0HGCMInit(void)
 {
     AssertReturn(g_hMtxHGCMHandleData == NIL_RTSEMFASTMUTEX, VINF_ALREADY_INITIALIZED);
@@ -75 +75 @@
  * @return VBox status code.
  */
-DECLVBGL(int) VbglR0HGCMTerminate(void)
+DECLR0VBGL(int) VbglR0HGCMTerminate(void)
 {
     RTSemFastMutexDestroy(g_hMtxHGCMHandleData);
@@ -139 +139 @@
 }
 
-DECLVBGL(int) VbglR0HGCMConnect(VBGLHGCMHANDLE *pHandle, const char *pszServiceName, HGCMCLIENTID *pidClient)
+DECLR0VBGL(int) VbglR0HGCMConnect(VBGLHGCMHANDLE *pHandle, const char *pszServiceName, HGCMCLIENTID *pidClient)
 {
     int rc;
@@ -182 +182 @@
 }
 
-DECLVBGL(int) VbglR0HGCMDisconnect(VBGLHGCMHANDLE handle, HGCMCLIENTID idClient)
+DECLR0VBGL(int) VbglR0HGCMDisconnect(VBGLHGCMHANDLE handle, HGCMCLIENTID idClient)
 {
     int rc;
@@ -199 +199 @@
 }
 
-DECLVBGL(int) VbglR0HGCMCallRaw(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
+DECLR0VBGL(int) VbglR0HGCMCallRaw(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
 {
     VBGL_HGCM_ASSERT_MSG(cbData >= sizeof(VBGLIOCHGCMCALL) + pData->cParms * sizeof(HGCMFunctionParameter),
@@ -208 +208 @@
 }
 
-DECLVBGL(int) VbglR0HGCMCall(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
+DECLR0VBGL(int) VbglR0HGCMCall(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
 {
     int rc = VbglR0HGCMCallRaw(handle, pData, cbData);
@@ -216 +216 @@
 }
 
-DECLVBGL(int) VbglR0HGCMCallUserDataRaw(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
+DECLR0VBGL(int) VbglR0HGCMCallUserDataRaw(VBGLHGCMHANDLE handle, PVBGLIOCHGCMCALL pData, uint32_t cbData)
 {
     VBGL_HGCM_ASSERT_MSG(cbData >= sizeof(VBGLIOCHGCMCALL) + pData->cParms * sizeof(HGCMFunctionParameter),

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibHGCMInternal.cpp

@@ -94 +94 @@
         /* Allocate request */
         VMMDevHGCMConnect *pHGCMConnect = NULL;
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pHGCMConnect, sizeof(VMMDevHGCMConnect), VMMDevReq_HGCMConnect);
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pHGCMConnect, sizeof(VMMDevHGCMConnect), VMMDevReq_HGCMConnect);
         if (RT_SUCCESS(rc))
         {
@@ -104 +104 @@
 
             /* Issue request */
-            rc = VbglGRPerform (&pHGCMConnect->header.header);
+            rc = VbglR0GRPerform (&pHGCMConnect->header.header);
             if (RT_SUCCESS(rc))
             {
@@ -118 +118 @@
                     *pidClient = pHGCMConnect->u32ClientID;
             }
-            VbglGRFree(&pHGCMConnect->header.header);
+            VbglR0GRFree(&pHGCMConnect->header.header);
         }
     }
@@ -136 +136 @@
         /* Allocate request */
         VMMDevHGCMDisconnect *pHGCMDisconnect = NULL;
-        rc = VbglGRAlloc ((VMMDevRequestHeader **)&pHGCMDisconnect, sizeof (VMMDevHGCMDisconnect), VMMDevReq_HGCMDisconnect);
+        rc = VbglR0GRAlloc ((VMMDevRequestHeader **)&pHGCMDisconnect, sizeof (VMMDevHGCMDisconnect), VMMDevReq_HGCMDisconnect);
         if (RT_SUCCESS(rc))
         {
@@ -145 +145 @@
 
             /* Issue request */
-            rc = VbglGRPerform(&pHGCMDisconnect->header.header);
+            rc = VbglR0GRPerform(&pHGCMDisconnect->header.header);
             if (RT_SUCCESS(rc))
             {
@@ -158 +158 @@
             }
 
-            VbglGRFree(&pHGCMDisconnect->header.header);
+            VbglR0GRFree(&pHGCMDisconnect->header.header);
         }
     }
@@ -631 +631 @@
     int rc;
 
-    Log(("calling VbglGRPerform\n"));
-    rc = VbglGRPerform(&pHGCMCall->header.header);
-    Log(("VbglGRPerform rc = %Rrc (header rc=%d)\n", rc, pHGCMCall->header.result));
+    Log(("calling VbglR0GRPerform\n"));
+    rc = VbglR0GRPerform(&pHGCMCall->header.header);
+    Log(("VbglR0GRPerform rc = %Rrc (header rc=%d)\n", rc, pHGCMCall->header.result));
 
     /*
@@ -672 +672 @@
              *  version of all that stuff, I would've done it already. */
             VMMDevHGCMCancel2 *pCancelReq;
-            int rc2 = VbglGRAlloc((VMMDevRequestHeader **)&pCancelReq, sizeof(*pCancelReq), VMMDevReq_HGCMCancel2);
+            int rc2 = VbglR0GRAlloc((VMMDevRequestHeader **)&pCancelReq, sizeof(*pCancelReq), VMMDevReq_HGCMCancel2);
             if (RT_SUCCESS(rc2))
             {
-                pCancelReq->physReqToCancel = VbglPhysHeapGetPhysAddr(pHGCMCall);
-                rc2 = VbglGRPerform(&pCancelReq->header);
-                VbglGRFree(&pCancelReq->header);
+                pCancelReq->physReqToCancel = VbglR0PhysHeapGetPhysAddr(pHGCMCall);
+                rc2 = VbglR0GRPerform(&pCancelReq->header);
+                VbglR0GRFree(&pCancelReq->header);
             }
 #if 1 /** @todo ADDVER: Remove this on next minor version change. */
@@ -685 +685 @@
                 pHGCMCall->header.fu32Flags |= VBOX_HGCM_REQ_CANCELLED;
                 pHGCMCall->header.header.requestType = VMMDevReq_HGCMCancel;
-                rc2 = VbglGRPerform(&pHGCMCall->header.header);
+                rc2 = VbglR0GRPerform(&pHGCMCall->header.header);
                 if (rc2 == VERR_INVALID_PARAMETER)
                     rc2 = VERR_NOT_FOUND;
@@ -890 +890 @@
          */
         VMMDevHGCMCall *pHGCMCall;
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pHGCMCall,
+        rc = VbglR0GRAlloc((VMMDevRequestHeader **)&pHGCMCall,
                          sizeof(VMMDevHGCMCall) + pCallInfo->cParms * sizeof(HGCMFunctionParameter) + cbExtra,
                          VMMDevReq_HGCMCall);
@@ -921 +921 @@
 
             if (!fLeakIt)
-                VbglGRFree(&pHGCMCall->header.header);
+                VbglR0GRFree(&pHGCMCall->header.header);
         }
     }

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibInit.cpp

@@ -44 +44 @@
 
 /**
- * Used by vbglQueryDriverInfo and VbglInit to try get the host feature mask and
- * version information (g_vbgldata::hostVersion).
+ * Used by vbglR0QueryDriverInfo and VbglInit to try get the host feature mask
+ * and version information (g_vbgldata::hostVersion).
  *
  * This was first implemented by the host in 3.1 and we quietly ignore failures
@@ -53 +53 @@
 {
     VMMDevReqHostVersion *pReq;
-    int rc = VbglGRAlloc((VMMDevRequestHeader **) &pReq, sizeof (*pReq), VMMDevReq_GetHostVersion);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglGRPerform(&pReq->header);
+    int rc = VbglR0GRAlloc((VMMDevRequestHeader **) &pReq, sizeof (*pReq), VMMDevReq_GetHostVersion);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR0GRPerform(&pReq->header);
         if (RT_SUCCESS(rc))
         {
@@ -64 +64 @@
         }
 
-        VbglGRFree(&pReq->header);
+        VbglR0GRFree(&pReq->header);
     }
 }
@@ -78 +78 @@
  * values and fails if they are unavailable.
  */
-static void vbglQueryDriverInfo(void)
+static void vbglR0QueryDriverInfo(void)
 {
 # ifdef VBGLDATA_USE_FAST_MUTEX
@@ -143 +143 @@
     if (g_vbgldata.status == VbglStatusInitializing)
     {
-        vbglQueryDriverInfo();
+        vbglR0QueryDriverInfo();
         if (g_vbgldata.status == VbglStatusReady)
             return VINF_SUCCESS;
@@ -152 +152 @@
 
 
-static int vbglInitCommon(void)
+static int vbglR0InitCommon(void)
 {
     int rc;
@@ -159 +159 @@
     g_vbgldata.status = VbglStatusInitializing;
 
-    rc = VbglPhysHeapInit();
-    if (RT_SUCCESS(rc))
-    {
-        dprintf(("vbglInitCommon: returns rc = %d\n", rc));
+    rc = VbglR0PhysHeapInit();
+    if (RT_SUCCESS(rc))
+    {
+        dprintf(("vbglR0InitCommon: returns rc = %d\n", rc));
         return rc;
     }
 
-    LogRel(("vbglInitCommon: VbglPhysHeapInit failed: rc=%Rrc\n", rc));
+    LogRel(("vbglR0InitCommon: VbglR0PhysHeapInit failed: rc=%Rrc\n", rc));
     g_vbgldata.status = VbglStatusNotInitialized;
     return rc;
@@ -172 +172 @@
 
 
-static void vbglTerminateCommon(void)
-{
-    VbglPhysHeapTerminate();
+static void vbglR0TerminateCommon(void)
+{
+    VbglR0PhysHeapTerminate();
     g_vbgldata.status = VbglStatusNotInitialized;
 }
@@ -180 +180 @@
 #ifdef VBGL_VBOXGUEST
 
-DECLVBGL(int) VbglInitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory)
+DECLVBGL(int) VbglR0InitPrimary(RTIOPORT portVMMDev, VMMDevMemory *pVMMDevMemory)
 {
     int rc;
@@ -197 +197 @@
 # endif
 
-    rc = vbglInitCommon();
+    rc = vbglR0InitCommon();
     if (RT_SUCCESS(rc))
     {
@@ -214 +214 @@
 DECLVBGL(void) VbglR0TerminatePrimary(void)
 {
-    vbglTerminateCommon();
+    vbglR0TerminateCommon();
 }
 
@@ -232 +232 @@
     }
 
-    rc = vbglInitCommon();
+    rc = vbglR0InitCommon();
     if (RT_SUCCESS(rc))
     {
@@ -243 +243 @@
         {
             /* Try to obtain VMMDev port via IOCTL to VBoxGuest main driver. */
-            vbglQueryDriverInfo();
+            vbglR0QueryDriverInfo();
 
 # ifdef VBOX_WITH_HGCM
@@ -259 +259 @@
 # endif
         }
-        vbglTerminateCommon();
+        vbglR0TerminateCommon();
     }
 
@@ -282 +282 @@
 # endif
 
-    /* note: do vbglTerminateCommon as a last step since it zeroez up the g_vbgldata
-     * conceptually, doing vbglTerminateCommon last is correct
+    /* note: do vbglR0TerminateCommon as a last step since it zeroez up the g_vbgldata
+     * conceptually, doing vbglR0TerminateCommon last is correct
      * since this is the reverse order to how init is done */
-    vbglTerminateCommon();
+    vbglR0TerminateCommon();
 }
 
@@ -295 +295 @@
     else
     {
-        vbglQueryDriverInfo();
+        vbglR0QueryDriverInfo();
         if (g_vbgldata.status != VbglStatusReady)
         {
@@ -308 +308 @@
 
 #endif /* !VBGL_VBOXGUEST */
+

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibMouse.cpp

@@ -48 +48 @@
  * @param   pvUser     user supplied data/cookie to be passed to the function.
  */
-DECLVBGL(int) VbglSetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser)
+DECLR0VBGL(int) VbglR0SetMouseNotifyCallback(PFNVBOXGUESTMOUSENOTIFY pfnNotify, void *pvUser)
 {
     PVBGLIDCHANDLE pIdcHandle;
@@ -63 +63 @@
 }
 
+
 /**
  * Retrieve mouse coordinates and features from the host.
@@ -73 +74 @@
  * @param   py          Where to store the Y co-ordinate.
  */
-DECLVBGL(int) VbglGetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py)
+DECLR0VBGL(int) VbglR0GetMouseStatus(uint32_t *pfFeatures, uint32_t *px, uint32_t *py)
 {
     PVBGLIDCHANDLE pIdcHandle;
@@ -98 +99 @@
 }
 
+
 /**
  * Send mouse features to the host.
@@ -108 +110 @@
  *                     feature enabled by any guest caller.
  */
-DECLVBGL(int) VbglSetMouseStatus(uint32_t fFeatures)
+DECLR0VBGL(int) VbglR0SetMouseStatus(uint32_t fFeatures)
 {
     PVBGLIDCHANDLE pIdcHandle;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp

@@ -397 +397 @@
 
 
-DECLVBGL(void *) VbglPhysHeapAlloc (uint32_t cbSize)
+DECLR0VBGL(void *) VbglR0PhysHeapAlloc (uint32_t cbSize)
 {
     VBGLPHYSHEAPBLOCK *pBlock, *iter;
@@ -494 +494 @@
 
     vbglPhysHeapLeave ();
-    VBGL_PH_dprintf(("VbglPhysHeapAlloc %x size %x\n", vbglPhysHeapBlock2Data (pBlock), pBlock->cbDataSize));
+    VBGL_PH_dprintf(("VbglR0PhysHeapAlloc %x size %x\n", vbglPhysHeapBlock2Data (pBlock), pBlock->cbDataSize));
 
     return vbglPhysHeapBlock2Data (pBlock);
 }
 
-DECLVBGL(uint32_t) VbglPhysHeapGetPhysAddr (void *p)
+DECLR0VBGL(uint32_t) VbglR0PhysHeapGetPhysAddr (void *p)
 {
     uint32_t physAddr = 0;
@@ -516 +516 @@
 }
 
-DECLVBGL(void) VbglPhysHeapFree(void *p)
+DECLR0VBGL(void) VbglR0PhysHeapFree(void *p)
 {
     VBGLPHYSHEAPBLOCK *pBlock;
@@ -543 +543 @@
     dumpheap ("post exclude");
 
-    VBGL_PH_dprintf(("VbglPhysHeapFree %x size %x\n", p, pBlock->cbDataSize));
+    VBGL_PH_dprintf(("VbglR0PhysHeapFree %x size %x\n", p, pBlock->cbDataSize));
 
     /* Mark as free */
@@ -613 +613 @@
 }
 
-DECLVBGL(int) VbglPhysHeapInit (void)
+DECLR0VBGL(int) VbglR0PhysHeapInit (void)
 {
     int rc = VINF_SUCCESS;
@@ -628 +628 @@
 }
 
-DECLVBGL(void) VbglPhysHeapTerminate (void)
+DECLR0VBGL(void) VbglR0PhysHeapTerminate (void)
 {
     while (g_vbgldata.pChunkHead)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibVMMDev.cpp

@@ -31 +31 @@
 
 
-DECLVBGL(int) VbglQueryVMMDevMemory(VMMDevMemory **ppVMMDevMemory)
+DECLVBGL(int) VbglR0QueryVMMDevMemory(VMMDevMemory **ppVMMDevMemory)
 {
     int rc = vbglR0Enter();

trunk/src/VBox/Additions/solaris/Mouse/testcase/solaris.h

@@ -347 +347 @@
 #define VBoxGuestCommonIOCtl(...) VINF_SUCCESS
 #define VBoxGuestCommonISR(...) true
-#define VbglGRAlloc(...) VINF_SUCCESS
-#define VbglGRPerform(...) VINF_SUCCESS
-#define VbglGRFree(...) do {} while(0)
+#define VbglR0GRAlloc(...) VINF_SUCCESS
+#define VbglR0GRPerform(...) VINF_SUCCESS
+#define VbglR0GRFree(...) do {} while(0)
 #endif
 #define VbglR0InitClient(...) VINF_SUCCESS

trunk/src/VBox/Additions/solaris/Mouse/vboxms.c

@@ -472 +472 @@
         if (RT_SUCCESS(rc))
         {
-            rc = VbglGRAlloc((VMMDevRequestHeader **)
+            rc = VbglR0GRAlloc((VMMDevRequestHeader **)
                              &pState->pMouseStatusReq,
                              sizeof(*pState->pMouseStatusReq),
@@ -488 +488 @@
                 qprocson(pReadQueue);
                 /* Enable our IRQ handler. */
-                rc2 = VbglSetMouseNotifyCallback(vbmsSolNotify,
-                                                 (void *)pState);
+                rc2 = VbglR0SetMouseNotifyCallback(vbmsSolNotify, (void *)pState);
                 if (RT_FAILURE(rc2))
                     /* Log the failure.  I may well have not understood what
@@ -525 +524 @@
     pState->pMouseStatusReq->pointerXPos = 0;
     pState->pMouseStatusReq->pointerYPos = 0;
-    rc = VbglGRPerform(&pState->pMouseStatusReq->header);
+    rc = VbglR0GRPerform(&pState->pMouseStatusReq->header);
     if (RT_SUCCESS(rc))
     {
@@ -590 +589 @@
     if (!pState->cInits)
     {
-        VbglSetMouseStatus(0);
+        VbglR0SetMouseStatus(0);
         /* Disable our IRQ handler. */
-        VbglSetMouseNotifyCallback(NULL, NULL);
+        VbglR0SetMouseNotifyCallback(NULL, NULL);
         qprocsoff(pReadQueue);
 
@@ -600 +599 @@
         ASMAtomicWriteNullPtr(&pState->pWriteQueue);
         pReadQueue->q_ptr = NULL;
-        VbglGRFree(&pState->pMouseStatusReq->header);
+        VbglR0GRFree(&pState->pMouseStatusReq->header);
         VbglR0TerminateClient();
     }
@@ -1376 +1375 @@
             pState->cMaxScreenY = pResolution->height - 1;
             /* Note: we don't disable this again until session close. */
-            rc = VbglSetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                    | VMMDEV_MOUSE_NEW_PROTOCOL);
+            rc = VbglR0SetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                      | VMMDEV_MOUSE_NEW_PROTOCOL);
             if (RT_SUCCESS(rc))
                 return 0;