Changeset 25180 in vbox for trunk/src

Timestamp:

Dec 4, 2009 10:36:30 AM (15 years ago)

Author:

vboxsync

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

55647

Message:

SUPDrv.c: Fixed shadow variable and addressed an todo.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -2935 +2935 @@
 SUPR0DECL(int) SUPR0GipMap(PSUPDRVSESSION pSession, PRTR3PTR ppGipR3, PRTHCPHYS pHCPhysGip)
 {
-    int             rc = VINF_SUCCESS;
+    int             rc;
     PSUPDRVDEVEXT   pDevExt = pSession->pDevExt;
-    RTR3PTR         pGip = NIL_RTR3PTR;
-    RTHCPHYS        HCPhys = NIL_RTHCPHYS;
+    RTR3PTR         pGipR3  = NIL_RTR3PTR;
+    RTHCPHYS        HCPhys  = NIL_RTHCPHYS;
     LogFlow(("SUPR0GipMap: pSession=%p ppGipR3=%p pHCPhysGip=%p\n", pSession, ppGipR3, pHCPhysGip));
 
@@ -2954 +2954 @@
          * Map it?
          */
+        rc = VINF_SUCCESS;
         if (ppGipR3)
         {
@@ -2960 +2961 @@
                                        RTMEM_PROT_READ, RTR0ProcHandleSelf());
             if (RT_SUCCESS(rc))
-            {
-                pGip = RTR0MemObjAddressR3(pSession->GipMapObjR3);
-                rc = VINF_SUCCESS; /** @todo remove this and replace the !rc below with RT_SUCCESS(rc). */
-            }
+                pGipR3 = RTR0MemObjAddressR3(pSession->GipMapObjR3);
         }
 
@@ -2969 +2967 @@
          * Get physical address.
          */
-        if (pHCPhysGip && !rc)
+        if (pHCPhysGip && RT_SUCCESS(rc))
             HCPhys = pDevExt->HCPhysGip;
 
@@ -2975 +2973 @@
          * Reference globally.
          */
-        if (!pSession->fGipReferenced && !rc)
+        if (!pSession->fGipReferenced && RT_SUCCESS(rc))
         {
             pSession->fGipReferenced = 1;
@@ -2981 +2979 @@
             if (pDevExt->cGipUsers == 1)
             {
-                PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
+                PSUPGLOBALINFOPAGE pGipR0 = pDevExt->pGip;
                 unsigned i;
 
                 LogFlow(("SUPR0GipMap: Resumes GIP updating\n"));
 
-                for (i = 0; i < RT_ELEMENTS(pGip->aCPUs); i++)
-                    ASMAtomicXchgU32(&pGip->aCPUs[i].u32TransactionId, pGip->aCPUs[i].u32TransactionId & ~(GIP_UPDATEHZ_RECALC_FREQ * 2 - 1));
-                ASMAtomicXchgU64(&pGip->u64NanoTSLastUpdateHz, 0);
+                for (i = 0; i < RT_ELEMENTS(pGipR0->aCPUs); i++)
+                    ASMAtomicXchgU32(&pGipR0->aCPUs[i].u32TransactionId, pGipR0->aCPUs[i].u32TransactionId & ~(GIP_UPDATEHZ_RECALC_FREQ * 2 - 1));
+                ASMAtomicXchgU64(&pGipR0->u64NanoTSLastUpdateHz, 0);
 
                 rc = RTTimerStart(pDevExt->pGipTimer, 0);
@@ -3008 +3006 @@
         *pHCPhysGip = HCPhys;
     if (ppGipR3)
-        *ppGipR3 = pGip;
+        *ppGipR3 = pGipR3;
 
 #ifdef DEBUG_DARWIN_GIP
-    OSDBGPRINT(("SUPR0GipMap: returns %d *pHCPhysGip=%lx pGip=%p\n", rc, (unsigned long)HCPhys, (void *)pGip));
+    OSDBGPRINT(("SUPR0GipMap: returns %d *pHCPhysGip=%lx pGipR3=%p\n", rc, (unsigned long)HCPhys, (void *)pGipR3));
 #else
-    LogFlow((   "SUPR0GipMap: returns %d *pHCPhysGip=%lx pGip=%p\n", rc, (unsigned long)HCPhys, (void *)pGip));
+    LogFlow((   "SUPR0GipMap: returns %d *pHCPhysGip=%lx pGipR3=%p\n", rc, (unsigned long)HCPhys, (void *)pGipR3));
 #endif
     return rc;