Changeset 62885 in vbox for trunk

Timestamp:

Aug 2, 2016 4:21:40 PM (8 years ago)

Author:

vboxsync

Message:

Devices: gcc warnings

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPCI.cpp (modified) (1 diff)
• Bus/DevPciIch9.cpp (modified) (3 diffs)
• Bus/MsiCommon.cpp (modified) (2 diffs)
• EFI/DevSmc.cpp (modified) (26 diffs)
• Graphics/DevVGA.cpp (modified) (6 diffs)
• Graphics/DevVGASavedState.h (modified) (1 diff)
• Input/PS2K.cpp (modified) (6 diffs)
• Input/PS2M.cpp (modified) (6 diffs)
• Input/UsbKbd.cpp (modified) (7 diffs)
• Input/UsbMouse.cpp (modified) (7 diffs)
• PC/DevLPC.cpp (modified) (6 diffs)
• Storage/VSCSI/VSCSIDevice.cpp (modified) (1 diff)
• Storage/VSCSI/VSCSILunMmc.cpp (modified) (3 diffs)
• Storage/VSCSI/VSCSILunSbc.cpp (modified) (1 diff)
• build/VBoxDD.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -2141 +2141 @@
 static DECLCALLBACK(int)   pciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF1(iInstance);
     Assert(iInstance == 0);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1943 +1943 @@
 {
     PICH9PCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PICH9PCIGLOBALS);
-    PVM             pVM = PDMDevHlpGetVM(pDevIns);
-    Assert(pVM);
 
     /*
@@ -1963 +1961 @@
      */
     for (int i = 0; i < 256; i++)
-    {
         ich9pciBiosInitDevice(pGlobals, 0, i);
-    }
 
     return VINF_SUCCESS;
@@ -2517 +2513 @@
 
 
-static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns,
-                                          int        iInstance,
-                                          PCFGMNODE  pCfg)
-{
+static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE  pCfg)
+{
+    RT_NOREF1(iInstance);
     Assert(iInstance == 0);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);

trunk/src/VBox/Devices/Bus/MsiCommon.cpp

@@ -201 +201 @@
 uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
 {
-    int32_t iOff = u32Address - pDev->Int.s.u8MsiCapOffset;
-
-    Assert(iOff >= 0 && (pciDevIsMsiCapable(pDev) && iOff < pDev->Int.s.u8MsiCapSize));
+    RT_NOREF1(pDevIns);
+#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
+    int32_t off = u32Address - pDev->Int.s.u8MsiCapOffset;
+    Assert(off >= 0 && (pciDevIsMsiCapable(pDev) && off < pDev->Int.s.u8MsiCapSize));
+#endif
     uint32_t rv = 0;
 
@@ -221 +223 @@
     }
 
-    Log2(("MsiPciConfigRead: %d (%d) -> %x\n", iOff, len, rv));
+    Log2(("MsiPciConfigRead: %d (%d) -> %x\n", off, len, rv));
 
     return rv;

trunk/src/VBox/Devices/EFI/DevSmc.cpp

@@ -582 +582 @@
 static uint8_t scmKeyGetOSKs(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF1(bCmd);
     Assert(SMC4CH_EQ(&pKeyDesc->Key, "OSK0") || SMC4CH_EQ(&pKeyDesc->Key, "OSK1"));
     const char *pszSrc = pThis->szOsk0And1;
@@ -594 +595 @@
 static uint8_t scmKeyGetKeyCount(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF3(pThis, bCmd, pKeyDesc);
     Assert(pKeyDesc == &g_aSmcKeys[SMC_KEYIDX_FIRST_ENUM]);
     uint32_t cKeys = RT_ELEMENTS(g_aSmcKeys) - SMC_KEYIDX_FIRST_ENUM;
@@ -604 +606 @@
 static uint8_t scmKeyGetRevision(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF3(pThis, bCmd, pKeyDesc);
 #ifdef VBOX_WITH_SMC_2_x
     pCurKey->Value.ab[0] = 0x02;
@@ -627 +630 @@
 static uint8_t scmKeyGetDollarAddress(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF3(pThis, bCmd, pKeyDesc);
     pCurKey->Value.u32 = RT_H2BE_U32(SMC_PORT_FIRST);
     return VINF_SUCCESS;
@@ -635 +639 @@
 static uint8_t scmKeyGetDollarNumber(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     pCurKey->Value.ab[0] = pThis->bDollaryNumber;
     return VINF_SUCCESS;
@@ -642 +647 @@
 static uint8_t scmKeyPutDollarNumber(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     Log(("scmKeyPutDollarNumber: %#x -> %#x\n", pThis->bDollaryNumber, pCurKey->Value.ab[0]));
     pThis->bDollaryNumber = pCurKey->Value.ab[0];
@@ -652 +658 @@
 static uint8_t scmKeyGetShutdownReason(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     pCurKey->Value.ab[0] = pThis->bShutdownReason;
     return SMC_STATUS_CD_SUCCESS;
@@ -660 +667 @@
 static uint8_t scmKeyPutShutdownReason(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     Log(("scmKeyPutShutdownReason: %#x -> %#x\n", pThis->bShutdownReason, pCurKey->Value.ab[0]));
     pThis->bShutdownReason = pCurKey->Value.ab[0];
@@ -669 +677 @@
 static uint8_t scmKeyGetNinjaTimerAction(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     pCurKey->Value.ab[0] = pThis->bNinjaActionTimerJob;
     return SMC_STATUS_CD_SUCCESS;
@@ -677 +686 @@
 static uint8_t scmKeyPutNinjaTimerAction(PDEVSMC pThis, PCDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(bCmd, pKeyDesc);
     Log(("scmKeyPutNinjaTimerAction: %#x -> %#x\n", pThis->bNinjaActionTimerJob, pCurKey->Value.ab[0]));
     pThis->bNinjaActionTimerJob = pCurKey->Value.ab[0];
@@ -687 +697 @@
 static uint8_t scmKeyGetOne(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(pThis, bCmd);
     memset(&pCurKey->Value.ab[0], 0, pKeyDesc->cbValue);
     pCurKey->Value.ab[pKeyDesc->cbValue - 1] = 1;
@@ -697 +708 @@
 static uint8_t scmKeyGetZero(PDEVSMC pThis, PDEVSMCCURKEY pCurKey, uint8_t bCmd, PCDEVSMCKEYDESC pKeyDesc)
 {
+    RT_NOREF2(pThis, bCmd);
     memset(&pCurKey->Value.ab[0], 0, pKeyDesc->cbValue);
     return SMC_STATUS_CD_SUCCESS;
@@ -706 +718 @@
  *
  * @returns Key index on success, UINT32_MAX on failure.
- * @param   pThis       The SMC instance data.
  * @param   uKeyValue   The key value (DEVSMC4CHID.u32).
  */
-static uint32_t smcKeyLookup(PDEVSMC pThis, uint32_t uKeyValue)
+static uint32_t smcKeyLookup(uint32_t uKeyValue)
 {
     uint32_t iKey = RT_ELEMENTS(g_aSmcKeys);
@@ -731 +742 @@
     uint32_t const uKeyValueLog = RT_H2LE_U32(pThis->CurKey.Key.u32);
 #endif
-    uint32_t iKey = smcKeyLookup(pThis, pThis->CurKey.Key.u32);
+    uint32_t iKey = smcKeyLookup(pThis->CurKey.Key.u32);
     if (iKey != UINT32_MAX)
     {
@@ -818 +829 @@
     uint32_t const uKeyValueLog = RT_H2LE_U32(pThis->CurKey.Key.u32);
 #endif
-    uint32_t iKey = smcKeyLookup(pThis, pThis->CurKey.Key.u32);
+    uint32_t iKey = smcKeyLookup(pThis->CurKey.Key.u32);
     if (iKey != UINT32_MAX)
     {
@@ -851 +862 @@
 static uint8_t smcKeyPutPrepare(PDEVSMC pThis)
 {
+    RT_NOREF1(pThis);
     return 0;
 }
@@ -856 +868 @@
 static uint8_t smcKeyPutValue(PDEVSMC pThis)
 {
+    RT_NOREF1(pThis);
     return 0;
 }
@@ -869 +882 @@
 static int smcRegData_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
 {
+    RT_NOREF1(uReg);
     switch (pThis->bCmd)
     {
@@ -958 +972 @@
 static int smcRegData_w(PDEVSMC pThis, uint8_t uReg, uint8_t bValue)
 {
+    RT_NOREF1(uReg);
     switch (pThis->bCmd)
     {
@@ -1143 +1158 @@
 static int smcRegFF_w(PDEVSMC pThis, uint8_t uReg, uint8_t bValue)
 {
+    RT_NOREF3(pThis, uReg, bValue);
     Log(("SMC: %#04x: Writing %#x to unknown register!\n", uReg, bValue));
     return VINF_SUCCESS;
@@ -1157 +1173 @@
 static int smcRegFF_r(PDEVSMC pThis, uint8_t uReg, uint8_t *pbValue)
 {
+    RT_NOREF2(pThis, uReg);
     Log(("SMC: %#04x: Reading from unknown register!\n", uReg));
     *pbValue = 0xff;
@@ -1260 +1277 @@
 PDMBOTHCBDECL(int) smcIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    RT_NOREF1(pvUser);
 #ifndef IN_RING3
     if (cb > 1)
@@ -1301 +1319 @@
 PDMBOTHCBDECL(int) smcIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    RT_NOREF1(pvUser);
 #ifndef IN_RING3
     if (cb > 1)
@@ -1352 +1371 @@
 {
     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
+    RT_NOREF2(pSSM, pThis);
 
     /** @todo */
@@ -1364 +1384 @@
     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
+    RT_NOREF2(pSSM, pThis);
 
     /* Fend off unsupported versions. */
@@ -1388 +1409 @@
 static DECLCALLBACK(int)  smcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF1(iInstance);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -2233 +2233 @@
                                PDMIDISPLAYCONNECTOR *pDrv)
 {
+    RT_NOREF1(fFailOnResize);
     int y, page_min, page_max, linesize, y_start;
     int width, height, page0, page1, bwidth, bits;
@@ -3558 +3559 @@
         PDMCritSectLeave(&pThis->CritSect);
         Assert(GCPtr == 0);
+        RT_NOREF1(GCPtr);
 #endif
         return VINF_SUCCESS;
@@ -5410 +5412 @@
  * @param   enmType         One of the PCI_ADDRESS_SPACE_* values.
  */
-static DECLCALLBACK(int) vgaR3IORegionMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
-{
+static DECLCALLBACK(int) vgaR3IORegionMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb,
+                                          PCIADDRESSSPACE enmType)
+{
+    RT_NOREF1(cb);
     int         rc;
     PPDMDEVINS  pDevIns = pPciDev->pDevIns;
@@ -5417 +5421 @@
     Log(("vgaR3IORegionMap: iRegion=%d GCPhysAddress=%RGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
 #ifdef VBOX_WITH_VMSVGA
-    AssertReturn((iRegion == ((pThis->fVMSVGAEnabled) ? 1 : 0)) && (enmType == ((pThis->fVMSVGAEnabled) ? PCI_ADDRESS_SPACE_MEM : PCI_ADDRESS_SPACE_MEM_PREFETCH)), VERR_INTERNAL_ERROR);
+    AssertReturn(   (iRegion == ((pThis->fVMSVGAEnabled) ? 1 : 0))
+                 && (enmType == ((pThis->fVMSVGAEnabled) ? PCI_ADDRESS_SPACE_MEM : PCI_ADDRESS_SPACE_MEM_PREFETCH)),
+                 VERR_INTERNAL_ERROR);
 #else
     AssertReturn(iRegion == 0 && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
@@ -5461 +5467 @@
         {
 #endif
-        rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
-        AssertRC(rc);
+            rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+            AssertRC(rc);
 #ifdef VBOX_WITH_VMSVGA
         }
@@ -5891 +5897 @@
 static DECLCALLBACK(void)  vgaDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF1(fFlags);
+    PVGASTATE   pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    AssertMsg(fFlags & PDM_TACH_FLAGS_NOT_HOT_PLUG, ("VGA device does not support hotplugging\n"));
+
     /*
      * Reset the interfaces and update the controller state.
      */
-    PVGASTATE   pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
-
-    AssertMsg(fFlags & PDM_TACH_FLAGS_NOT_HOT_PLUG,
-              ("VGA device does not support hotplugging\n"));
-
     switch (iLUN)
     {

trunk/src/VBox/Devices/Graphics/DevVGASavedState.h

@@ -38 +38 @@
             uint64_t uMarker; \
             int rcMarker = SSMR3GetU64(pSSM, &uMarker); \
-            AssertLogRelRCReturn(rc, rc); \
+            AssertLogRelRCReturn(rcMarker, rcMarker); \
             AssertLogRelMsgReturn(uMarker == VGA_SAVED_STATE_MAKE_MARKER(uSub), \
                                   ("Bad VGA marker: expected %llx, got %llx\n", VGA_SAVED_STATE_MAKE_MARKER(uSub), uMarker), \

trunk/src/VBox/Devices/Input/PS2K.cpp

@@ -1013 +1013 @@
 static DECLCALLBACK(void) ps2kTypematicTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PPS2K pThis = (PS2K *)pvUser; NOREF(pDevIns);
+    RT_NOREF2(pDevIns, pTimer);
+    PPS2K pThis = (PS2K *)pvUser;
     LogFlowFunc(("Typematic state=%d, key %02X\n", pThis->enmTypematicState, pThis->u8TypematicKey));
 
@@ -1037 +1038 @@
 static DECLCALLBACK(void) ps2kDelayTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PPS2K pThis = (PS2K *)pvUser; NOREF(pDevIns);
+    RT_NOREF2(pDevIns, pTimer);
+    PPS2K pThis = (PS2K *)pvUser;
 
     LogFlowFunc(("Delay timer: cmd %02X\n", pThis->u8CurrCmd));
@@ -1349 +1351 @@
 int PS2KLoadDone(PPS2K pThis, PSSMHANDLE pSSM)
 {
+    RT_NOREF1(pSSM);
+
     /* This *must* be done after the inital load because it may trigger
      * interrupts and change the interrupt controller state.
@@ -1380 +1384 @@
 void PS2KRelocate(PPS2K pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
 {
+    RT_NOREF1(pDevIns);
     LogFlowFunc(("Relocating PS2K\n"));
     pThis->pKbdDelayTimerRC     = TMTimerRCPtr(pThis->pKbdDelayTimerR3);
@@ -1388 +1393 @@
 int PS2KConstruct(PPS2K pThis, PPDMDEVINS pDevIns, void *pParent, int iInstance)
 {
-    int     rc;
-
+    RT_NOREF2(pDevIns, iInstance);
     LogFlowFunc(("iInstance=%d\n", iInstance));
 
@@ -1410 +1414 @@
      */
     PTMTIMER pTimer;
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_REAL, ps2kTypematicTimer, pThis,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "PS2K Typematic Timer", &pTimer);
+    int rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_REAL, ps2kTypematicTimer, pThis,
+                                    TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "PS2K Typematic Timer", &pTimer);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Input/PS2M.cpp

@@ -835 +835 @@
 static DECLCALLBACK(void) ps2mThrottleTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PPS2M       pThis = (PS2M *)pvUser; NOREF(pDevIns);
+    RT_NOREF2(pDevIns, pTimer);
+    PPS2M       pThis = (PS2M *)pvUser;
     uint32_t    uHaveEvents;
 
@@ -868 +869 @@
 static DECLCALLBACK(void) ps2mDelayTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PPS2M pThis = (PS2M *)pvUser; NOREF(pDevIns);
+    RT_NOREF2(pDevIns, pTimer);
+    PPS2M pThis = (PS2M *)pvUser;
 
     LogFlowFunc(("Delay timer: cmd %02X\n", pThis->u8CurrCmd));
@@ -942 +944 @@
                               int32_t dz, int32_t dw, uint32_t fButtons)
 {
+    RT_NOREF1(dw);
     int             rc = VINF_SUCCESS;
 
@@ -1079 +1082 @@
 void PS2MSaveState(PPS2M pThis, PSSMHANDLE pSSM)
 {
-    uint32_t    cPressed = 0;
-
     LogFlowFunc(("Saving PS2M state\n"));
 
@@ -1172 +1173 @@
 void PS2MRelocate(PPS2M pThis, RTGCINTPTR offDelta, PPDMDEVINS pDevIns)
 {
+    RT_NOREF2(pDevIns, offDelta);
     LogFlowFunc(("Relocating PS2M\n"));
     pThis->pDelayTimerRC    = TMTimerRCPtr(pThis->pDelayTimerR3);
     pThis->pThrottleTimerRC = TMTimerRCPtr(pThis->pThrottleTimerR3);
-    NOREF(offDelta);
 }
 
 int PS2MConstruct(PPS2M pThis, PPDMDEVINS pDevIns, void *pParent, int iInstance)
 {
-    int     rc;
+    RT_NOREF1(iInstance);
 
     LogFlowFunc(("iInstance=%d\n", iInstance));
@@ -1204 +1205 @@
      */
     PTMTIMER pTimer;
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_REAL, ps2mThrottleTimer, pThis,
-                                TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "PS2M Throttle Timer", &pTimer);
+    int rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_REAL, ps2mThrottleTimer, pThis,
+                                    TMTIMER_FLAGS_DEFAULT_CRIT_SECT, "PS2M Throttle Timer", &pTimer);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Input/UsbKbd.cpp

@@ -498 +498 @@
 static int usbHidCompleteStall(PUSBHID pThis, PUSBHIDEP pEp, PVUSBURB pUrb, const char *pszWhy)
 {
+    RT_NOREF1(pszWhy);
     Log(("usbHidCompleteStall/#%u: pUrb=%p:%s: %s\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pszWhy));
 
@@ -1151 +1152 @@
 static DECLCALLBACK(int) usbHidUsbSetInterface(PPDMUSBINS pUsbIns, uint8_t bInterfaceNumber, uint8_t bAlternateSetting)
 {
+    RT_NOREF3(pUsbIns, bInterfaceNumber, bAlternateSetting);
     LogFlow(("usbHidUsbSetInterface/#%u: bInterfaceNumber=%u bAlternateSetting=%u\n", pUsbIns->iInstance, bInterfaceNumber, bAlternateSetting));
     Assert(bAlternateSetting == 0);
@@ -1163 +1165 @@
                                                    const void *pvOldCfgDesc, const void *pvOldIfState, const void *pvNewCfgDesc)
 {
+    RT_NOREF3(pvOldCfgDesc, pvOldIfState, pvNewCfgDesc);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogFlow(("usbHidUsbSetConfiguration/#%u: bConfigurationValue=%u\n", pUsbIns->iInstance, bConfigurationValue));
@@ -1191 +1194 @@
 static DECLCALLBACK(PCPDMUSBDESCCACHE) usbHidUsbGetDescriptorCache(PPDMUSBINS pUsbIns)
 {
-    PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
+    PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID); RT_NOREF_PV(pThis);
     LogFlow(("usbHidUsbGetDescriptorCache/#%u:\n", pUsbIns->iInstance));
     return &g_UsbHidDescCache;
@@ -1202 +1205 @@
 static DECLCALLBACK(int) usbHidUsbReset(PPDMUSBINS pUsbIns, bool fResetOnLinux)
 {
+    RT_NOREF1(fResetOnLinux);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogFlow(("usbHidUsbReset/#%u:\n", pUsbIns->iInstance));
@@ -1218 +1222 @@
 static DECLCALLBACK(void) usbHidDestruct(PPDMUSBINS pUsbIns)
 {
+    PDMUSB_CHECK_VERSIONS_RETURN_VOID(pUsbIns);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogFlow(("usbHidDestruct/#%u:\n", pUsbIns->iInstance));
@@ -1242 +1247 @@
 static DECLCALLBACK(int) usbHidConstruct(PPDMUSBINS pUsbIns, int iInstance, PCFGMNODE pCfg, PCFGMNODE pCfgGlobal)
 {
+    RT_NOREF1(pCfgGlobal);
+    PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     Log(("usbHidConstruct/#%u:\n", iInstance));

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -1440 +1440 @@
  * @interface_method_impl{PDMIMOUSEPORT,pfnPutEvent}
  */
-static DECLCALLBACK(int) usbHidMousePutEvent(PPDMIMOUSEPORT pInterface,
-                                             int32_t dx, int32_t dy, int32_t dz,
-                                             int32_t dw, uint32_t fButtons)
-{
+static DECLCALLBACK(int) usbHidMousePutEvent(PPDMIMOUSEPORT pInterface, int32_t dx, int32_t dy,
+                                             int32_t dz, int32_t dw, uint32_t fButtons)
+{
+    RT_NOREF1(dw);
     PUSBHID pThis = RT_FROM_MEMBER(pInterface, USBHID, Lun0.IPort);
     RTCritSectEnter(&pThis->CritSect);
@@ -1796 +1796 @@
 #define SET_PROTOCOL 0x0B
 
-static uint8_t sau8QASampleBlob[256] =
+static uint8_t const g_abQASampleBlob[256] =
 {
     0xfc, 0x28, 0xfe, 0x84, 0x40, 0xcb, 0x9a, 0x87,
@@ -1888 +1888 @@
                 else if (u8ReportType == 3 && u8ReportID == REPORTID_TOUCH_QABLOB)
                 {
-                    uint32_t cbLeft = pUrb->cbData;
                     pUrb->abData[sizeof(VUSBSETUP) + 0] = REPORTID_TOUCH_QABLOB;  /* Report Id. */
                     memcpy(&pUrb->abData[sizeof(VUSBSETUP) + 1],
-                           sau8QASampleBlob, sizeof(sau8QASampleBlob));
-                    cbData = sizeof(sau8QASampleBlob) + 1;
+                           g_abQASampleBlob, sizeof(g_abQASampleBlob));
+                    cbData = sizeof(g_abQASampleBlob) + 1;
                 }
                 else if (u8ReportType == 3 && u8ReportID == REPORTID_TOUCH_DEVCONFIG)
@@ -2222 +2221 @@
                                                    const void *pvOldCfgDesc, const void *pvOldIfState, const void *pvNewCfgDesc)
 {
+    RT_NOREF3(pvOldCfgDesc, pvOldIfState, pvNewCfgDesc);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogRelFlow(("usbHidUsbSetConfiguration/#%u: bConfigurationValue=%u\n",
@@ -2274 +2274 @@
 static DECLCALLBACK(int) usbHidUsbReset(PPDMUSBINS pUsbIns, bool fResetOnLinux)
 {
+    RT_NOREF1(fResetOnLinux);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogRelFlow(("usbHidUsbReset/#%u:\n", pUsbIns->iInstance));
@@ -2290 +2291 @@
 static DECLCALLBACK(void) usbHidDestruct(PPDMUSBINS pUsbIns)
 {
+    PDMUSB_CHECK_VERSIONS_RETURN_VOID(pUsbIns);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     LogRelFlow(("usbHidDestruct/#%u:\n", pUsbIns->iInstance));
@@ -2313 +2315 @@
 static DECLCALLBACK(int) usbHidConstruct(PPDMUSBINS pUsbIns, int iInstance, PCFGMNODE pCfg, PCFGMNODE pCfgGlobal)
 {
+    RT_NOREF1(pCfgGlobal);
+    PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
     char szMode[64];

trunk/src/VBox/Devices/PC/DevLPC.cpp

@@ -79 +79 @@
 static uint32_t rcba_ram_readl(LPCState* s, RTGCPHYS addr)
 {
+    RT_NOREF1(s);
     Log(("rcba_read at %llx\n", (uint64_t)addr));
     int32_t iIndex = (addr - RCBA_BASE);
@@ -105 +106 @@
 static void rcba_ram_writel(LPCState* s, RTGCPHYS addr, uint32_t value)
 {
+    RT_NOREF2(s, value);
     Log(("rcba_write %llx = %#x\n", (uint64_t)addr, value));
     int32_t iIndex = (addr - RCBA_BASE);
@@ -133 +135 @@
 PDMBOTHCBDECL(int)  lpcMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
+    RT_NOREF2(pvUser, cb);
     LPCState *s = PDMINS_2_DATA(pDevIns, LPCState*);
     Assert(cb == 4); Assert(!(GCPhysAddr & 3));
@@ -153 +156 @@
 PDMBOTHCBDECL(int) lpcMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
+    RT_NOREF1(pvUser);
     LPCState *s = PDMINS_2_DATA(pDevIns, LPCState*);
 
@@ -182 +186 @@
 static DECLCALLBACK(void) lpcInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF1(pszArgs);
     LPCState   *pThis = PDMINS_2_DATA(pDevIns, LPCState *);
     LogFlow(("lpcInfo: \n"));
@@ -210 +215 @@
 static DECLCALLBACK(int) lpcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF2(iInstance, pCfg);
+    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     LPCState   *pThis = PDMINS_2_DATA(pDevIns, LPCState *);
     int         rc;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSIDevice.cpp

@@ -325 +325 @@
                                        size_t cbSense, void *pvVScsiReqUser)
 {
+    RT_NOREF1(cbSGList);
     PVSCSIDEVICEINT pVScsiDevice = (PVSCSIDEVICEINT)hVScsiDevice;
     PVSCSIREQINT    pVScsiReq    = NULL;

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp

@@ -128 +128 @@
 static int mmcReadTOCMulti(PVSCSILUNINT pVScsiLun, PVSCSIREQINT pVScsiReq, uint16_t cbMaxTransfer, bool fMSF)
 {
-    PVSCSILUNMMC    pVScsiLunMmc = (PVSCSILUNMMC)pVScsiLun;
+    RT_NOREF1(cbMaxTransfer);
     uint8_t         aReply[32];
     uint8_t         *pbBuf = aReply;
@@ -172 +172 @@
 static DECLCALLBACK(int) vscsiLunMmcDestroy(PVSCSILUNINT pVScsiLun)
 {
-    PVSCSILUNMMC    pVScsiLunMmc = (PVSCSILUNMMC)pVScsiLun;
-
+    RT_NOREF1(pVScsiLun);
     return VINF_SUCCESS;
 }
@@ -368 +367 @@
         case SCSI_LOG_SENSE:
         {
-            uint16_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]);
             uint8_t uPageCode = pVScsiReq->pbCDB[2] & 0x3f;
             uint8_t uSubPageCode = pVScsiReq->pbCDB[3];

trunk/src/VBox/Devices/Storage/VSCSI/VSCSILunSbc.cpp

@@ -428 +428 @@
         case SCSI_LOG_SENSE:
         {
-            uint16_t cbMax = vscsiBE2HU16(&pVScsiReq->pbCDB[7]);
             uint8_t uPageCode = pVScsiReq->pbCDB[2] & 0x3f;
             uint8_t uSubPageCode = pVScsiReq->pbCDB[3];

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -384 +384 @@
 {
     int rc = VINF_SUCCESS;
+    RT_NOREF1(u32Version);
 
 #ifdef VBOX_WITH_USB