Changeset 25240 in vbox

Timestamp:

Dec 8, 2009 1:01:03 PM (15 years ago)

Author:

vboxsync

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

55754

Message:

HWACCM.cpp: -Wshadow

File:

• trunk/src/VBox/VMM/HWACCM.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -387 +387 @@
      *  Default false for Mac OS X and Windows due to the higher risk of conflicts with other hypervisors.
      */
-    rc = CFGMR3QueryBoolDef(pHWVirtExt, "Exclusive", &pVM->hwaccm.s.fGlobalInit, 
+    rc = CFGMR3QueryBoolDef(pHWVirtExt, "Exclusive", &pVM->hwaccm.s.fGlobalInit,
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS)
                             false
@@ -851 +851 @@
                     LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_REAL_MODE\n"));
                 if (val & VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT)
-                    LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT\n"));               
+                    LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT\n"));
 
                 val = pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.disallowed0;
@@ -871 +871 @@
                     LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_REAL_MODE *must* be set\n"));
                 if (val & VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT)
-                    LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT *must* be set\n"));               
+                    LogRel(("HWACCM:    VMX_VMCS_CTRL_PROC_EXEC2_PAUSE_LOOP_EXIT *must* be set\n"));
             }
 
@@ -1208 +1208 @@
                 LogRel(("HWACCM:    AMD_CPUID_SVM_FEATURE_EDX_SSE_3_5_DISABLE\n"));
             if (pVM->hwaccm.s.svm.u32Features & AMD_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER)
-                LogRel(("HWACCM:    AMD_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER\n"));           
+                LogRel(("HWACCM:    AMD_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER\n"));
 
             /* Only try once. */
@@ -1646 +1646 @@
     VMCPUID      idCpu  = (VMCPUID)(uintptr_t)pvUser;
     PCPUMCTX     pCtx   = CPUMQueryGuestCtxPtr(pVCpu);
-    RTGCPTR      oldrip = pCtx->rip;
     PDISCPUSTATE pDis   = &pVCpu->hwaccm.s.DisState;
     unsigned     cbOp;
@@ -1671 +1670 @@
         uint8_t         aVMMCall[3] = { 0xf, 0x1, 0xd9};
         uint32_t        idx = pVM->hwaccm.s.cPatches;
-        PHWACCMTPRPATCH pPatch = &pVM->hwaccm.s.aPatches[idx];
+
+        pPatch = &pVM->hwaccm.s.aPatches[idx];
 
         rc = PGMPhysSimpleReadGCPtr(pVCpu, pPatch->aOpcode, pCtx->rip, cbOp);
@@ -1834 +1834 @@
     {
         uint32_t        idx = pVM->hwaccm.s.cPatches;
-        PHWACCMTPRPATCH pPatch = &pVM->hwaccm.s.aPatches[idx];
         uint8_t         aPatch[64];
         uint32_t        off = 0;
+
+        pPatch = &pVM->hwaccm.s.aPatches[idx];
 
 #ifdef LOG_ENABLED