Changeset 54331 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 20, 2015 2:30:51 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrv.c -> SUPDrv.cpp; SUPDrvSem.c -> SUPDrvSem.cpp

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.cpp (moved) (moved from trunk/src/VBox/HostDrivers/Support/SUPDrv.c ) (7 diffs)
• SUPDrvIOC.h (modified) (4 diffs)
• SUPDrvSem.cpp (moved) (moved from trunk/src/VBox/HostDrivers/Support/SUPDrvSem.c ) (1 diff)
• freebsd/files_vboxdrv (modified) (1 diff)
• linux/files_vboxdrv (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -616 +616 @@
  VBoxDrv_SOURCES          = \
         SUPDrv.d \
-        SUPDrv.c \
+        SUPDrv.cpp \
         SUPDrvGip.cpp \
-        SUPDrvSem.c \
+        SUPDrvSem.cpp \
         SUPDrvTracer.cpp \
         SUPLibAll.cpp

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -1681 +1681 @@
         }
 
-        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_VMMR0(0)):
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_VMMR0_NO_SIZE()):
         {
             /* validate */
@@ -1899 +1899 @@
         }
 
-        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_SERVICE(0)):
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_CALL_SERVICE_NO_SIZE()):
         {
             /* validate */
@@ -1923 +1923 @@
         }
 
-        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_LOGGER_SETTINGS(0)):
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_LOGGER_SETTINGS_NO_SIZE()):
         {
             /* validate */
@@ -4575 +4575 @@
     {
         pImage->uState = SUP_IOCTL_LDR_LOAD;
-        pImage->pfnModuleInit = pReq->u.In.pfnModuleInit;
-        pImage->pfnModuleTerm = pReq->u.In.pfnModuleTerm;
+        pImage->pfnModuleInit = (PFNR0MODULEINIT)pReq->u.In.pfnModuleInit;
+        pImage->pfnModuleTerm = (PFNR0MODULETERM)pReq->u.In.pfnModuleTerm;
 
         if (pImage->fNative)
@@ -4603 +4603 @@
                 break;
             case SUPLDRLOADEP_SERVICE:
-                pImage->pfnServiceReqHandler = pReq->u.In.EP.Service.pfnServiceReq;
+                pImage->pfnServiceReqHandler = (PFNSUPR0SERVICEREQHANDLER)pReq->u.In.EP.Service.pfnServiceReq;
                 rc = VINF_SUCCESS;
                 break;
@@ -4889 +4889 @@
             if (!strcmp(g_aFunctions[i].szName, pszSymbol))
             {
-                pReq->u.Out.pfnSymbol = g_aFunctions[i].pfn;
+                pReq->u.Out.pfnSymbol = (PFNRT)g_aFunctions[i].pfn;
                 break;
             }
@@ -4958 +4958 @@
     if (!pDevExt->pvVMMR0)
     {
-        pDevExt->pvVMMR0            = pvVMMR0;
-        pDevExt->pfnVMMR0EntryInt   = pvVMMR0EntryInt;
-        pDevExt->pfnVMMR0EntryFast  = pvVMMR0EntryFast;
-        pDevExt->pfnVMMR0EntryEx    = pvVMMR0EntryEx;
+        pDevExt->pvVMMR0 = pvVMMR0;
+        *(void **)&pDevExt->pfnVMMR0EntryInt  = pvVMMR0EntryInt;
+        *(void **)&pDevExt->pfnVMMR0EntryFast = pvVMMR0EntryFast;
+        *(void **)&pDevExt->pfnVMMR0EntryEx   = pvVMMR0EntryEx;
+        ASMCompilerBarrier(); /* the above isn't nice, so be careful... */
     }
     else

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -403 +403 @@
         {
             /** The address of module initialization function. Similar to _DLL_InitTerm(hmod, 0). */
-            PFNR0MODULEINIT pfnModuleInit;
+            RTR0PTR pfnModuleInit;
             /** The address of module termination function. Similar to _DLL_InitTerm(hmod, 1). */
-            PFNR0MODULETERM pfnModuleTerm;
+            RTR0PTR pfnModuleTerm;
             /** Special entry points. */
             union
@@ -527 +527 @@
  */
 #define SUP_IOCTL_CALL_VMMR0(cbReq)                     SUP_CTL_CODE_SIZE(7, SUP_IOCTL_CALL_VMMR0_SIZE(cbReq))
+#define SUP_IOCTL_CALL_VMMR0_NO_SIZE()                  SUP_CTL_CODE_SIZE(7, 0)
 #define SUP_IOCTL_CALL_VMMR0_SIZE(cbReq)                RT_UOFFSETOF(SUPCALLVMMR0, abReqPkt[cbReq])
 #define SUP_IOCTL_CALL_VMMR0_SIZE_IN(cbReq)             SUP_IOCTL_CALL_VMMR0_SIZE(cbReq)
@@ -987 +988 @@
  */
 #define SUP_IOCTL_CALL_SERVICE(cbReq)                   SUP_CTL_CODE_SIZE(22, SUP_IOCTL_CALL_SERVICE_SIZE(cbReq))
+#define SUP_IOCTL_CALL_SERVICE_NO_SIZE(cbReq)           SUP_CTL_CODE_SIZE(22, 0)
 #define SUP_IOCTL_CALL_SERVICE_SIZE(cbReq)              RT_UOFFSETOF(SUPCALLSERVICE, abReqPkt[cbReq])
 #define SUP_IOCTL_CALL_SERVICE_SIZE_IN(cbReq)           SUP_IOCTL_CALL_SERVICE_SIZE(cbReq)
@@ -1017 +1019 @@
  */
 #define SUP_IOCTL_LOGGER_SETTINGS(cbStrTab)             SUP_CTL_CODE_SIZE(23, SUP_IOCTL_LOGGER_SETTINGS_SIZE(cbStrTab))
+#define SUP_IOCTL_LOGGER_SETTINGS_NO_SIZE()             SUP_CTL_CODE_SIZE(23, 0)
 #define SUP_IOCTL_LOGGER_SETTINGS_SIZE(cbStrTab)        RT_UOFFSETOF(SUPLOGGERSETTINGS, u.In.szStrings[cbStrTab])
 #define SUP_IOCTL_LOGGER_SETTINGS_SIZE_IN(cbStrTab)     RT_UOFFSETOF(SUPLOGGERSETTINGS, u.In.szStrings[cbStrTab])

trunk/src/VBox/HostDrivers/Support/SUPDrvSem.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

@@ -86 +86 @@
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c=>freebsd/SUPDrv-freebsd.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.c=>SUPDrv.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.cpp=>SUPDrv.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvGip.cpp=>SUPDrvGip.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvSem.c=>SUPDrvSem.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvSem.cpp=>SUPDrvSem.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp=>SUPDrvTracer.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvIDC.h=>SUPDrvIDC.h \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -80 +80 @@
     ${PATH_ROOT}/include/VBox/vmm/hm_svm.h=>include/VBox/vmm/hm_svm.h \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c=>linux/SUPDrv-linux.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.c=>SUPDrv.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.cpp=>SUPDrv.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvGip.cpp=>SUPDrvGip.c \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvSem.c=>SUPDrvSem.c \
+    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvSem.cpp=>SUPDrvSem.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp=>SUPDrvTracer.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp=>SUPDrvDTrace.c \