Changeset 62655 in vbox for trunk

Timestamp:

Jul 28, 2016 10:22:47 PM (8 years ago)

Author:

vboxsync

Message:

VMMR3: warnings

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDMAsyncCompletionFileNormal.cpp (modified) (3 diffs)
• PDMNetShaper.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp

@@ -726 +726 @@
 
     bool fInserted = RTAvlrFileOffsetInsert(pEndpoint->AioMgr.pTreeRangesLocked, &pRangeLock->Core);
-    AssertMsg(fInserted, ("Range lock was not inserted!\n"));
+    AssertMsg(fInserted, ("Range lock was not inserted!\n")); NOREF(fInserted);
 
     /* Let the task point to its lock. */
@@ -1430 +1430 @@
                 {
                     bool fReqsPending = pdmacFileAioMgrNormalRemoveEndpoint(pEndpoint);
-                    Assert(!fReqsPending);
+                    Assert(!fReqsPending); NOREF(fReqsPending);
 
                     rc = pdmacFileAioMgrAddEndpoint(pEndpoint->AioMgr.pAioMgrDst, pEndpoint);
@@ -1587 +1587 @@
                     /* If the endpoint is about to be migrated do it now. */
                     bool fReqsPending = pdmacFileAioMgrNormalRemoveEndpoint(pEndpoint);
-                    Assert(!fReqsPending);
+                    Assert(!fReqsPending); NOREF(fReqsPending);
 
                     rc = pdmacFileAioMgrAddEndpoint(pEndpoint->AioMgr.pAioMgrDst, pEndpoint);

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -305 +305 @@
     AssertPtrReturn(pFilter, VERR_INVALID_POINTER);
     AssertReturn(pFilter->pBwGroupR3 == NULL, VERR_ALREADY_EXISTS);
+    RT_NOREF_PV(pDrvIns);
 
     PPDMNETSHAPER pShaper = pUVM->pdm.s.pNetShaper;
@@ -344 +345 @@
 VMMR3_INT_DECL(int) PDMR3NsDetach(PUVM pUVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter)
 {
+    RT_NOREF_PV(pDrvIns);
     VM_ASSERT_EMT(pUVM->pVM);
     AssertPtrReturn(pFilter, VERR_INVALID_POINTER);
+
     /* Now, return quietly if the filter isn't attached since driver/device
        destructors are called on constructor failure. */
@@ -412 +415 @@
 static DECLCALLBACK(int) pdmR3NsTxThread(PVM pVM, PPDMTHREAD pThread)
 {
+    RT_NOREF_PV(pVM);
+
     PPDMNETSHAPER pShaper = (PPDMNETSHAPER)pThread->pvUser;
     LogFlow(("pdmR3NsTxThread: pShaper=%p\n", pShaper));
@@ -437 +442 @@
 static DECLCALLBACK(int) pdmR3NsTxWakeUp(PVM pVM, PPDMTHREAD pThread)
 {
-    PPDMNETSHAPER pShaper = (PPDMNETSHAPER)pThread->pvUser;
-    LogFlow(("pdmR3NsTxWakeUp: pShaper=%p\n", pShaper));
+    RT_NOREF2(pVM, pThread);
+    LogFlow(("pdmR3NsTxWakeUp: pShaper=%p\n", pThread->pvUser));
     /* Nothing to do */
     return VINF_SUCCESS;
@@ -504 +509 @@
                 for (PCFGMNODE pCur = CFGMR3GetFirstChild(pCfgBwGrp); pCur; pCur = CFGMR3GetNextChild(pCur))
                 {
-                    uint64_t cbMax;
                     size_t cbName = CFGMR3GetNameLen(pCur) + 1;
                     char *pszBwGrpId = (char *)RTMemAllocZ(cbName);
-
-                    if (!pszBwGrpId)
+                    if (pszBwGrpId)
                     {
+                        rc = CFGMR3GetName(pCur, pszBwGrpId, cbName);
+                        if (RT_SUCCESS(rc))
+                        {
+                            uint64_t cbMax;
+                            rc = CFGMR3QueryU64(pCur, "Max", &cbMax);
+                            if (RT_SUCCESS(rc))
+                                rc = pdmNsBwGroupCreate(pShaper, pszBwGrpId, cbMax);
+                        }
+                        RTMemFree(pszBwGrpId);
+                    }
+                    else
                         rc = VERR_NO_MEMORY;
-                        break;
-                    }
-
-                    rc = CFGMR3GetName(pCur, pszBwGrpId, cbName);
-                    AssertRC(rc);
-
-                    if (RT_SUCCESS(rc))
-                        rc = CFGMR3QueryU64(pCur, "Max", &cbMax);
-                    if (RT_SUCCESS(rc))
-                        rc = pdmNsBwGroupCreate(pShaper, pszBwGrpId, cbMax);
-
-                    RTMemFree(pszBwGrpId);
-
                     if (RT_FAILURE(rc))
                         break;