Changeset 62437 in vbox for trunk

Timestamp:

Jul 22, 2016 1:03:28 PM (8 years ago)

Author:

vboxsync

Message:

Devices: MSC level 4 warnings (release build)

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchHda.cpp (modified) (4 diffs)
• Bus/MsixCommon.cpp (modified) (2 diffs)
• Network/DevE1000.cpp (modified) (2 diffs)
• Network/DrvDedicatedNic.cpp (modified) (2 diffs)
• Network/SrvIntNetR0.cpp (modified) (1 diff)
• PC/DevIOAPIC_New.cpp (modified) (1 diff)
• PC/DevIoApic.cpp (modified) (2 diffs)
• Storage/DevLsiLogicSCSI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevIchHda.cpp

@@ -2170 +2170 @@
 {
     const uint8_t  u8Strm  = HDA_SD_NUM_FROM_REG(pThis, LPIB, iReg);
-          uint32_t u32LPIB = HDA_STREAM_REG(pThis, LPIB, u8Strm);
+    uint32_t       u32LPIB = HDA_STREAM_REG(pThis, LPIB, u8Strm);
+#ifdef LOG_ENABLED
     const uint32_t u32CBL  = HDA_STREAM_REG(pThis, CBL,  u8Strm);
-
     LogFlowFunc(("[SD%RU8]: LPIB=%RU32, CBL=%RU32\n", u8Strm, u32LPIB, u32CBL));
+#endif
 
     *pu32Value = u32LPIB;
@@ -2292 +2293 @@
 static int hdaRegWriteSDCTL(PHDASTATE pThis, uint32_t iReg, uint32_t u32Value)
 {
+#if defined(IN_RING3) || defined(LOG_ENABLED) || defined(VBOX_STRICT)
     bool fRun      = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
     bool fInRun    = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, RUN));
+#endif
     bool fReset    = RT_BOOL(u32Value & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
     bool fInReset  = RT_BOOL(HDA_REG_IND(pThis, iReg) & HDA_REG_FIELD_FLAG_MASK(SDCTL, SRST));
@@ -4552 +4555 @@
     }
 
-    uint32_t idxRegMem = g_aHdaRegMap[idxRegDsc].mem_idx;
 #ifdef LOG_ENABLED
+    uint32_t const idxRegMem   = g_aHdaRegMap[idxRegDsc].mem_idx;
     uint32_t const u32CurValue = pThis->au32Regs[idxRegMem];
 #endif
@@ -4657 +4660 @@
                               g_afMasks[cbReg] & ~g_afMasks[cb], u64Value & g_afMasks[cb], u64Value));
                 }
-                uint32_t u32LogOldVal = pThis->au32Regs[idxRegMem];
+#ifdef LOG_ENABLED
+                uint32_t uLogOldVal = pThis->au32Regs[idxRegMem];
+#endif
                 rc = hdaWriteReg(pThis, idxRegDsc, u64Value, "*");
-                Log3Func(("\t%#x -> %#x\n", u32LogOldVal, pThis->au32Regs[idxRegMem]));
+                Log3Func(("\t%#x -> %#x\n", uLogOldVal, pThis->au32Regs[idxRegMem]));
             }
             else

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

@@ -330 +330 @@
 uint32_t MsixPciConfigRead(PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
 {
+    NOREF(pDevIns);
+#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
     int32_t iOff = u32Address - pDev->Int.s.u8MsixCapOffset;
-    NOREF(pDevIns);
-
     Assert(iOff >= 0 && (pciDevIsMsixCapable(pDev) && iOff < pDev->Int.s.u8MsixCapSize));
-    uint32_t rv = 0;
-
+#endif
+    uint32_t rv;
     switch (len)
     {
@@ -348 +348 @@
             break;
         default:
-            Assert(false);
+            AssertFailed();
+            rv = 0;
     }
 
     Log2(("MsixPciConfigRead: %d (%d) -> %x\n", iOff, len, rv));
-
     return rv;
 }
+

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -4267 +4267 @@
 static int e1kFallbackAddToFrame(PE1KSTATE pThis, E1KTXDESC* pDesc, bool fOnWorkerThread)
 {
-    int rc = VINF_SUCCESS;
+#ifdef VBOX_STRICT
     PPDMSCATTERGATHER pTxSg = pThis->CTX_SUFF(pTxSg);
     Assert(e1kGetDescType(pDesc) == E1K_DTYP_DATA);
     Assert(pDesc->data.cmd.fTSE);
     Assert(!e1kXmitIsGsoBuf(pTxSg));
+#endif
 
     uint16_t u16MaxPktLen = pThis->contextTSE.dw3.u8HDRLEN + pThis->contextTSE.dw3.u16MSS;
@@ -4280 +4281 @@
      * Carve out segments.
      */
+    int rc;
     do
     {

trunk/src/VBox/Devices/Network/DrvDedicatedNic.cpp

@@ -252 +252 @@
 PDMBOTHCBDECL(int) drvDedicatedNicUp_FreeBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf)
 {
+#ifdef VBOX_STRICT
     PDRVDEDICATEDNIC  pThis = RT_FROM_MEMBER(pInterface, DRVDEDICATEDNIC, CTX_SUFF(INetworkUp));
     Assert(pSgBuf->fFlags == (PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1));
     Assert(pSgBuf->cbUsed <= pSgBuf->cbAvailable);
     Assert(PDMCritSectIsOwner(&pThis->XmitLock));
+#endif
 
     if (pSgBuf)
@@ -292 +294 @@
      * Tell the driver to send the packet.
      */
-
+    NOREF(pThis);
     return VERR_INTERNAL_ERROR_4;
 

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -1404 +1404 @@
     PINTNETADDRCACHE pCache = &pIf->aAddrCache[enmAddrType];
 
+#if defined(LOG_ENABLED) || defined(VBOX_STRICT)
     const uint8_t cbAddr = pCache->cbAddress;
     Assert(cbAddr == intnetR0AddrSize(enmAddrType));
+#endif
 
     RTSpinlockAcquire(pNetwork->hAddrSpinlock);

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

@@ -761 +761 @@
                                                             uTagSrc);
     /* Can't reschedule to R3. */
-    Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED);
+    Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED); NOREF(rc);
 }
 

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

@@ -180 +180 @@
                 /* We must be sure that attempts to reschedule in R3
                    never get here */
-                Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED);
+                Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED); NOREF(rc);
             }
         }
@@ -524 +524 @@
     /* We must be sure that attempts to reschedule in R3
        never get here */
-    Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED);
+    Assert(rc == VINF_SUCCESS || rc == VERR_APIC_INTR_DISCARDED); NOREF(rc);
 }
 

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -1768 +1768 @@
                                            RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
+#ifdef LOG_ENABLED
     PLSILOGICSCSI  pThis = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
-
     LogFlowFunc(("pThis=%#p GCPhysAddr=%RGp pv=%#p{%.*Rhxs} cb=%u\n", pThis, GCPhysAddr, pv, cb, pv, cb));
+#endif
 
     return VINF_SUCCESS;
@@ -1778 +1779 @@
                                           RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
+#ifdef LOG_ENABLED
     PLSILOGICSCSI  pThis = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
-
     LogFlowFunc(("pThis=%#p GCPhysAddr=%RGp pv=%#p{%.*Rhxs} cb=%u\n", pThis, GCPhysAddr, pv, cb, pv, cb));
+#endif
 
     return VINF_SUCCESS;