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

Timestamp:

Nov 26, 2009 1:36:37 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55306

Message:

VMM: Fixed a few of -Wshadow warnings.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• DBGF.cpp (modified) (1 diff)
• EMRaw.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/CPUM.cpp

@@ -1036 +1036 @@
             if (fStrictCpuIdChecks) \
             { \
-                int rc = SSMR3SetLoadError(pSSM, VERR_SSM_LOAD_CPUID_MISMATCH, RT_SRC_POS, "%s", pszMsg); \
+                int rcCpuid = SSMR3SetLoadError(pSSM, VERR_SSM_LOAD_CPUID_MISMATCH, RT_SRC_POS, "%s", pszMsg); \
                 RTStrFree(pszMsg); \
-                return rc; \
+                return rcCpuid; \
             } \
             LogRel(("CPUM: %s\n", pszMsg)); \

trunk/src/VBox/VMM/DBGF.cpp

@@ -627 +627 @@
                 &&  !VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_REQUEST))
             {
-                int rc = RTSemPingWait(&pVM->dbgf.s.PingPong, cPollHack);
+                rc = RTSemPingWait(&pVM->dbgf.s.PingPong, cPollHack);
                 if (RT_SUCCESS(rc))
                     break;

trunk/src/VBox/VMM/EMRaw.cpp

@@ -867 +867 @@
 
         DISCPUSTATE Cpu;
-        int         rc;
-
         rc = CPUMR3DisasmInstrCPU(pVM, pVCpu, pCtx, pCtx->eip, &Cpu, "Patch code: ");
         if (    RT_SUCCESS(rc)
@@ -1007 +1005 @@
 static int emR3RawPrivileged(PVM pVM, PVMCPU pVCpu)
 {
-    STAM_PROFILE_START(&pVCpu->em.s.StatPrivEmu, a);
     PCPUMCTX    pCtx = pVCpu->em.s.pCtx;