Changeset 63753 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 7, 2016 4:21:09 PM (8 years ago)

Author:

vboxsync

Message:

VMM: gcc 6.2 warning fix.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFR3Trace.cpp (modified) (1 diff)
• PGMShw.h (modified) (1 diff)

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

@@ -123 +123 @@
     rc = RTTraceBufCarve(&hTraceBuf, cEntries, cbEntry, 0 /*fFlags*/, pvBlock, &cbBlock);
     AssertRCReturn(rc, rc);
-    AssertRelease(hTraceBuf == (RTTRACEBUF)pvBlock && (void *)hTraceBuf == pvBlock);
+    AssertRelease(hTraceBuf == (RTTRACEBUF)pvBlock);
+    AssertRelease((void *)hTraceBuf == pvBlock);
 
     pVM->hTraceBufR3 = hTraceBuf;

trunk/src/VBox/VMM/VMMR3/PGMShw.h

@@ -134 +134 @@
 PGM_SHW_DECL(int, InitData)(PVM pVM, PPGMMODEDATA pModeData, bool fResolveGCAndR0)
 {
+#if PGM_SHW_TYPE != PGM_TYPE_NESTED
     Assert(pModeData->uShwType == PGM_SHW_TYPE || pModeData->uShwType == PGM_TYPE_NESTED);
+#else
+    Assert(pModeData->uShwType == PGM_SHW_TYPE);
+#endif
 
     /* Ring-3 */