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

Timestamp:

Jul 28, 2016 11:30:23 PM (8 years ago)

Author:

vboxsync

Message:

SUPDrv: warnings

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (7 diffs)
• SUPDrvGip.cpp (modified) (22 diffs)
• SUPDrvIOC.h (modified) (1 diff)
• SUPDrvInternal.h (modified) (1 diff)
• SUPR0IdcClientInternal.h (modified) (1 diff)
• SUPR0IdcClientStubs.c (modified) (1 diff)

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

@@ -148 +148 @@
 DECLINLINE(int)             supdrvLdrUnlock(PSUPDRVDEVEXT pDevExt);
 static int                  supdrvIOCtl_CallServiceModule(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPCALLSERVICE pReq);
-static int                  supdrvIOCtl_LoggerSettings(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPLOGGERSETTINGS pReq);
+static int                  supdrvIOCtl_LoggerSettings(PSUPLOGGERSETTINGS pReq);
 static int                  supdrvIOCtl_MsrProber(PSUPDRVDEVEXT pDevExt, PSUPMSRPROBER pReq);
 static int                  supdrvIOCtl_ResumeSuspendedKbds(void);
@@ -2027 +2027 @@
 
             /* execute */
-            pReq->Hdr.rc = supdrvIOCtl_LoggerSettings(pDevExt, pSession, pReq);
+            pReq->Hdr.rc = supdrvIOCtl_LoggerSettings(pReq);
             return 0;
         }
@@ -3836 +3836 @@
     return supdrvOSEnableVTx(fEnable);
 #else
+    RT_NOREF1(fEnable);
     return VERR_NOT_SUPPORTED;
 #endif
@@ -3870 +3871 @@
     supdrvOSResumeVTxOnCpu(fSuspended);
 #else
+    RT_NOREF1(fSuspended);
     Assert(!fSuspended);
 #endif
@@ -4693 +4695 @@
             {
                 supdrvLdrUnlock(pDevExt);
-                Log(("Bad entry point address: %s=%p (rc=%Rrc)\n", pszWhat, pv, rc));
+                Log(("Bad entry point address: %s=%p (rc=%Rrc)\n", pszWhat, pv, rc)); NOREF(pszWhat);
                 return rc;
             }
@@ -5523 +5525 @@
  *
  * @returns VBox status code.
- * @param   pDevExt     The device extension.
- * @param   pSession    The caller's session.
  * @param   pReq        The request.
  */
-static int supdrvIOCtl_LoggerSettings(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPLOGGERSETTINGS pReq)
+static int supdrvIOCtl_LoggerSettings(PSUPLOGGERSETTINGS pReq)
 {
     const char *pszGroup = &pReq->u.In.szStrings[pReq->u.In.offGroups];
@@ -5707 +5707 @@
     return rc;
 #else
+    RT_NOREF2(pDevExt, pReq);
     return VERR_NOT_IMPLEMENTED;
 #endif

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

@@ -188 +188 @@
  * updating.
  *
- * @param   pGip             Pointer to the GIP.
  * @param   pGipCpu          The per CPU structure for this CPU.
  * @param   u64NanoTS        The current time.
  */
-static void supdrvGipReInitCpu(PSUPGLOBALINFOPAGE pGip, PSUPGIPCPU pGipCpu, uint64_t u64NanoTS)
+static void supdrvGipReInitCpu(PSUPGIPCPU pGipCpu, uint64_t u64NanoTS)
 {
     /*
@@ -217 +216 @@
 
     if (RT_LIKELY(iCpu < pGip->cCpus && pGip->aCPUs[iCpu].idCpu == idCpu))
-        supdrvGipReInitCpu(pGip, &pGip->aCPUs[iCpu], *(uint64_t *)pvUser2);
+        supdrvGipReInitCpu(&pGip->aCPUs[iCpu], *(uint64_t *)pvUser2);
 
     NOREF(pvUser2);
@@ -260 +259 @@
     uint16_t                idApic;
     int                     iCpuSet;
+    NOREF(pGip);
 
     AssertMsg(idCpu == RTMpCpuId(), ("idCpu=%#x RTMpCpuId()=%#x\n", idCpu, RTMpCpuId())); /* paranoia^3 */
@@ -505 +505 @@
                     || pGipR0->u32Mode == SUPGIPMODE_SYNC_TSC
                     || RTMpGetOnlineCount() == 1)
-                    supdrvGipReInitCpu(pGipR0, &pGipR0->aCPUs[0], u64NanoTS);
+                    supdrvGipReInitCpu(&pGipR0->aCPUs[0], u64NanoTS);
                 else
                     RTMpOnAll(supdrvGipReInitCpuCallback, pGipR0, &u64NanoTS);
@@ -915 +915 @@
  *
  * @param   pDevExt         Pointer to the device instance data.
- * @param   pGip            Pointer to the GIP.
- */
-static void supdrvGipInitStartTimerForRefiningInvariantTscFreq(PSUPDRVDEVEXT pDevExt, PSUPGLOBALINFOPAGE pGip)
+ */
+static void supdrvGipInitStartTimerForRefiningInvariantTscFreq(PSUPDRVDEVEXT pDevExt)
 {
     uint64_t    u64NanoTS;
@@ -1004 +1003 @@
     uint64_t   *puTscStop = (uint64_t *)pvUser1;
     uint64_t   *pnsStop   = (uint64_t *)pvUser2;
+    RT_NOREF1(idCpu);
 
     *puTscStop = ASMReadTSC();
@@ -1020 +1020 @@
  *
  * @returns VBox status code.
- * @param   pDevExt         Pointer to the device instance.
  * @param   pGip            Pointer to the GIP.
  * @param   fRough          Set if we're doing the rough calculation that the
@@ -1028 +1027 @@
  *                          achieve in reasonably short time.
  */
-static int supdrvGipInitMeasureTscFreq(PSUPDRVDEVEXT pDevExt, PSUPGLOBALINFOPAGE pGip, bool fRough)
+static int supdrvGipInitMeasureTscFreq(PSUPGLOBALINFOPAGE pGip, bool fRough)
 {
     uint32_t nsTimerIncr = RTTimerGetSystemGranularity();
@@ -1485 +1484 @@
        bit to much. */
     supdrvGipMpEventOnlineOrInitOnCpu((PSUPDRVDEVEXT)pvUser1, idCpu);
+    NOREF(pvUser2);
 }
 
@@ -1499 +1499 @@
     Assert(RTMpCpuIdToSetIndex(idCpu) == (intptr_t)pvUser2);
     ASMAtomicWriteU64((uint64_t volatile *)pvUser1, ASMReadTSC());
+    RT_NOREF2(idCpu, pvUser2);
 }
 
@@ -1683 +1684 @@
 
     ASMAtomicWriteSize(&pCpu->enmState, SUPGIPCPUSTATE_INVALID);
-    ASMAtomicWriteSize(&pCpu->idCpu,    NIL_RTCPUID);
+    ASMAtomicWriteU32(&pCpu->idCpu,     NIL_RTCPUID);
     ASMAtomicWriteS16(&pCpu->iCpuSet,   -1);
     ASMAtomicWriteU16(&pCpu->idApic,    UINT16_MAX);
@@ -1879 +1880 @@
     if (pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC)
     {
-        rc = supdrvGipInitMeasureTscFreq(pDevExt, pGip, true /*fRough*/); /* cannot fail */
-        supdrvGipInitStartTimerForRefiningInvariantTscFreq(pDevExt, pGip);
+        rc = supdrvGipInitMeasureTscFreq(pGip, true /*fRough*/); /* cannot fail */
+        supdrvGipInitStartTimerForRefiningInvariantTscFreq(pDevExt);
     }
     else
-        rc = supdrvGipInitMeasureTscFreq(pDevExt, pGip, false /*fRough*/);
+        rc = supdrvGipInitMeasureTscFreq(pGip, false /*fRough*/);
     if (RT_SUCCESS(rc))
     {
@@ -2442 +2443 @@
     uint64_t           u64TSC    = ASMReadTSC();
     uint64_t           u64NanoTS = RTTimeSystemNanoTS();
+    RT_NOREF1(pTimer);
 
     if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO)
@@ -2490 +2492 @@
     uint64_t        u64TSC    = ASMReadTSC();
     uint64_t        NanoTS    = RTTimeSystemNanoTS();
+    RT_NOREF1(pTimer);
 
     /** @todo reset the transaction number and whatnot when iTick == 1. */
@@ -2940 +2943 @@
 {
     TSCDELTA_DBG_VARS();
+    RT_NOREF1(pOtherSync);
 
     /*
@@ -3165 +3169 @@
 
 
-static void supdrvTscDeltaMethod2ProcessDataOnMaster(PSUPDRVGIPTSCDELTARGS pArgs, uint32_t iLoop)
+static void supdrvTscDeltaMethod2ProcessDataOnMaster(PSUPDRVGIPTSCDELTARGS pArgs)
 {
     int64_t     iMasterTscDelta  = pArgs->pMaster->i64TSCDelta;
@@ -3264 +3268 @@
 {
     unsigned iLoop;
+    RT_NOREF1(iTry);
 
     for (iLoop = 0; iLoop < GIP_TSC_DELTA_M2_LOOPS; iLoop++)
@@ -3314 +3319 @@
             if (iLoop >= GIP_TSC_DELTA_M2_PRIMER_LOOPS)
 # endif
-                supdrvTscDeltaMethod2ProcessDataOnMaster(pArgs, iLoop);
+                supdrvTscDeltaMethod2ProcessDataOnMaster(pArgs);
 
             TSCDELTA_MASTER_KICK_OTHER_OUT_OF_AFTER(pMySync, pOtherSync);
@@ -3507 +3512 @@
     PSUPTSCDELTASYNC2 volatile *ppOtherSync = fIsMaster ? &pArgs->pSyncWorker : &pArgs->pSyncMaster;
     TSCDELTA_DBG_VARS();
+    RT_NOREF1(pMySync);
 
     /*
@@ -3752 +3758 @@
 {
     supdrvMeasureTscDeltaCallbackUnwrapped(idCpu, (PSUPDRVGIPTSCDELTARGS)pvUser1);
+    RT_NOREF1(pvUser2);
 }
 
@@ -4234 +4241 @@
         }
     }
-
-    return rc;
+    /* not reached */
 }
 
@@ -4639 +4645 @@
     uint32_t        fFlags;
     RTMSINTERVAL    cMsWaitRetry;
+    RT_NOREF1(pDevExt);
 
     /*

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

@@ -50 +50 @@
 #ifdef RT_OS_WINDOWS
 # ifndef CTL_CODE
-#  include <Windows.h>
+#  include <iprt/win/windows.h>
 # endif
   /* Automatic buffering, size not encoded. */

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

@@ -48 +48 @@
 
 #elif defined(RT_OS_WINDOWS)
-    RT_C_DECLS_BEGIN
-#   if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
-#       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
-#       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
-#       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
-#       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
-#       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
-#       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
-#       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
-#       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
-#       pragma warning(disable : 4163)
-#       include <iprt/nt/nt.h>
-#       pragma warning(default : 4163)
-#       undef  _InterlockedExchange
-#       undef  _InterlockedExchangeAdd
-#       undef  _InterlockedCompareExchange
-#       undef  _InterlockedAddLargeStatistic
-#       undef  _interlockedbittestandset
-#       undef  _interlockedbittestandreset
-#       undef  _interlockedbittestandset64
-#       undef  _interlockedbittestandreset64
-#   else
-#       include <iprt/nt/nt.h>
-#   endif
+#   include <iprt/nt/nt.h>
 #   include <memory.h>
-    RT_C_DECLS_END
 
 #elif defined(RT_OS_LINUX)

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

@@ -32 +32 @@
 
 #ifdef RT_OS_WINDOWS
-# if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
-#  include <iprt/asm.h>
-#  define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
-#  define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
-#  define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
-#  pragma warning(disable : 4163)
-RT_C_DECLS_BEGIN
-#  include <ntddk.h>
-RT_C_DECLS_END
-#  pragma warning(default : 4163)
-#  undef  _InterlockedExchange
-#  undef  _InterlockedExchangeAdd
-#  undef  _InterlockedCompareExchange
-#  undef  _InterlockedAddLargeStatistic
-# else
-RT_C_DECLS_BEGIN
-#  include <ntddk.h>
-RT_C_DECLS_END
-# endif
-#endif /* RT_OS_WINDOWS */
+# include <iprt/nt/ntddk.h>
+#endif
 
 

trunk/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c

@@ -58 +58 @@
     rc = supR0IdcNativeCall(pHandle, SUPDRV_IDC_REQ_GET_SYMBOL, &Req.Hdr);
     if (RT_SUCCESS(rc))
-        ASMAtomicWritePtr((void * volatile *)ppfn, Req.u.Out.pfnSymbol);
+        ASMAtomicWritePtr((void * volatile *)ppfn, (void *)(uintptr_t)Req.u.Out.pfnSymbol);
 }