Changeset 25251 in vbox

Timestamp:

Dec 8, 2009 2:39:01 PM (15 years ago)

Author:

vboxsync

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

55771

Message:

PGMAllPhys.cpp: -Wshadow

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -1584 +1584 @@
     {
 #ifdef IN_RING3
-        PPGMPHYSHANDLER pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
+        pPhys = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhys);
         AssertReleaseMsg(pPhys, ("GCPhys=%RGp cb=%#x\n", GCPhys, cb));
         Assert(GCPhys >= pPhys->Core.Key && GCPhys <= pPhys->Core.KeyLast);
@@ -1966 +1966 @@
         if (fMoreVirt && !pVirt)
         {
-            int rc = pgmHandlerVirtualFindByPhysAddr(pVM, GCPhys, &pVirt, &iVirtPage);
+            rc = pgmHandlerVirtualFindByPhysAddr(pVM, GCPhys, &pVirt, &iVirtPage);
             if (RT_SUCCESS(rc))
             {
@@ -2141 +2141 @@
                                   + (iVirtPage << PAGE_SHIFT)
                                   + (GCPhys & PAGE_OFFSET_MASK);
-                STAM_PROFILE_START(&pVirt->Stat, h);
+                STAM_PROFILE_START(&pVirt->Stat, h2);
                 int rc2 = pVirt->CTX_SUFF(pfnHandler)(pVM, GCPtr, pvDst, (void *)pvBuf, cbRange, PGMACCESSTYPE_WRITE, /*pCur->CTX_SUFF(pvUser)*/ NULL);
-                STAM_PROFILE_STOP(&pVirt->Stat, h);
+                STAM_PROFILE_STOP(&pVirt->Stat, h2);
                 if (rc2 == VINF_SUCCESS && rc == VINF_PGM_HANDLER_DO_DEFAULT)
                     rc = VINF_SUCCESS;
@@ -2839 +2839 @@
         /* copy */
         size_t cbWrite = PAGE_SIZE - ((RTGCUINTPTR)GCPtrDst & PAGE_OFFSET_MASK);
-        int rc = PGMPhysWrite(pVM, GCPhys, pvSrc, cbWrite);
+        rc = PGMPhysWrite(pVM, GCPhys, pvSrc, cbWrite);
         if (cbWrite >= cb || RT_FAILURE(rc))
             return rc;