Changeset 63465 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 15, 2016 10:00:20 AM (8 years ago)

Author:

vboxsync

Message:

VMM: warnings (clang)

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (2 diffs)
• CPUMDbg.cpp (modified) (2 diffs)
• CPUMR3Db.cpp (modified) (2 diffs)
• EM.cpp (modified) (7 diffs)
• PGMPhys.cpp (modified) (1 diff)
• SELM.cpp (modified) (1 diff)
• SSM.cpp (modified) (1 diff)
• VMEmt.cpp (modified) (1 diff)

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

@@ -371 +371 @@
 };
 
+#if 0 /** @todo */
 /** Saved state field descriptors for X86XSAVEOPMASK. */
 static const SSMFIELD g_aCpumOpmaskFields[] =
@@ -384 +385 @@
     SSMFIELD_ENTRY_TERM()
 };
+#endif
 
 /** Saved state field descriptors for X86XSAVEZMMHI256. */

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

@@ -1086 +1086 @@
 };
 
+#if 0 /** @todo */
 /** Sub-fields for the SF_MASK MSR. */
 static DBGFREGSUBFIELD const g_aCpumRegFields_sf_mask[] =
@@ -1092 +1093 @@
     DBGFREGSUBFIELD_TERMINATOR()
 };
+#endif
 
 

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

@@ -183 +183 @@
 /** @} */
 
+#ifndef CPUM_DB_STANDALONE
 
 #include "cpus/Intel_Core_i7_6700K.h"
@@ -295 +296 @@
 
 
-#ifndef CPUM_DB_STANDALONE
 
 /**

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

@@ -92 +92 @@
 #endif
 static VBOXSTRICTRC emR3Debug(PVM pVM, PVMCPU pVCpu, VBOXSTRICTRC rc);
+#if defined(VBOX_WITH_REM) || defined(DEBUG)
 static int emR3RemStep(PVM pVM, PVMCPU pVCpu);
+#endif
 static int emR3RemExecute(PVM pVM, PVMCPU pVCpu, bool *pfFFDone);
 int emR3HighPriorityPostForcedActions(PVM pVM, PVMCPU pVCpu, int rc);
@@ -519 +521 @@
 #ifdef VBOX_WITH_REM
     PDMR3CritSectDelete(&pVM->em.s.CritSectREM);
+#else
+    RT_NOREF(pVM);
 #endif
     return VINF_SUCCESS;
@@ -990 +994 @@
 
 
+#if defined(VBOX_WITH_REM) || defined(DEBUG)
 /**
  * Steps recompiled code.
@@ -1003 +1008 @@
     Log3(("emR3RemStep: cs:eip=%04x:%08x\n", CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
 
-#ifdef VBOX_WITH_REM
+# ifdef VBOX_WITH_REM
     EMRemLock(pVM);
 
@@ -1017 +1022 @@
     EMRemUnlock(pVM);
 
-#else
+# else
     int rc = VBOXSTRICTRC_TODO(IEMExecOne(pVCpu)); NOREF(pVM);
-#endif
+# endif
 
     Log3(("emR3RemStep: returns %Rrc cs:eip=%04x:%08x\n", rc, CPUMGetGuestCS(pVCpu),  CPUMGetGuestEIP(pVCpu)));
     return rc;
 }
-
-
+#endif /* VBOX_WITH_REM || DEBUG */
+
+
+#ifdef VBOX_WITH_REM
 /**
  * emR3RemExecute helper that syncs the state back from REM and leave the REM
@@ -1036 +1043 @@
 DECLINLINE(bool) emR3RemExecuteSyncBack(PVM pVM, PVMCPU pVCpu)
 {
-#ifdef VBOX_WITH_REM
     STAM_PROFILE_START(&pVCpu->em.s.StatREMSync, a);
     REMR3StateBack(pVM, pVCpu);
@@ -1042 +1048 @@
 
     EMRemUnlock(pVM);
-#endif
     return false;
 }
+#endif
 
 

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

@@ -2871 +2871 @@
     else
     {
+#ifdef VBOX_WITH_REM
         RTGCPHYS cb = pCur->RamRange.cb;
+#endif
 
         /* Clear the tracking data of pages we're going to reactivate. */

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

@@ -107 +107 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-#ifdef LOG_ENABLED
+#if defined(VBOX_WITH_RAW_MODE) && defined(LOG_ENABLED)
 /** Segment register names. */
 static char const g_aszSRegNms[X86_SREG_COUNT][4] = { "ES", "CS", "SS", "DS", "FS", "GS" };

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

@@ -869 +869 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#ifndef SSM_STANDALONE
 /** Zeros used by the struct putter.
  * This must be at least 8 bytes or the code breaks. */
 static uint8_t const    g_abZero[_1K] = {0};
+#endif
 
 

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

@@ -962 +962 @@
              && pUVCpu->pVCpu->enmState == VMCPUSTATE_STARTED_EXEC_REM)
         REMR3NotifyFF(pUVCpu->pVM);
+#else
+    RT_NOREF(fFlags);
 #endif
 }