Changeset 57854 in vbox for trunk

Timestamp:

Sep 22, 2015 1:47:01 PM (9 years ago)

Author:

vboxsync

Message:

VMM: unused parameter warning fixes.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -1057 +1057 @@
     Assert(enmOp > HM64ON32OP_INVALID && enmOp < HM64ON32OP_END);
 
+    NOREF(pCtx);
+
     /* Disable interrupts. */
     RTHCUINTREG uOldEFlags = ASMIntDisableFlags();

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2988 +2988 @@
     }
 #else
+    NOREF(pVM);
     uintptr_t uTRBase = X86DESC_BASE(pDesc);
 #endif
@@ -5077 +5078 @@
                                          uint32_t cParams, uint32_t *paParam)
 {
-    int             rc, rc2;
-    PHMGLOBALCPUINFO pCpu;
-    RTHCPHYS        HCPhysCpuPage;
-    RTCCUINTREG     fOldEFlags;
+    NOREF(pCtx);
 
     AssertReturn(pVM->hm.s.pfnHost32ToGuest64R0, VERR_HM_NO_32_TO_64_SWITCHER);
@@ -5096 +5094 @@
 
     /* Disable interrupts. */
-    fOldEFlags = ASMIntDisableFlags();
+    RTCCUINTREG fOldEFlags = ASMIntDisableFlags();
 
 #ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
@@ -5103 +5101 @@
 #endif
 
-    pCpu = HMR0GetCurrentCpu();
-    HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
+    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    RTHCPHYS HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
 
     /* Clear VMCS. Marking it inactive, clearing implementation-specific data and writing VMCS data back to memory. */
@@ -5122 +5120 @@
 
     /* Call the switcher. */
-    rc = pVM->hm.s.pfnHost32ToGuest64R0(pVM, RT_OFFSETOF(VM, aCpus[pVCpu->idCpu].cpum) - RT_OFFSETOF(VM, cpum));
+    int rc = pVM->hm.s.pfnHost32ToGuest64R0(pVM, RT_OFFSETOF(VM, aCpus[pVCpu->idCpu].cpum) - RT_OFFSETOF(VM, cpum));
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatWorldSwitch3264, z);
 
@@ -5130 +5128 @@
 
     /* Re-enter VMX Root Mode */
-    rc2 = VMXEnable(HCPhysCpuPage);
+    int rc2 = VMXEnable(HCPhysCpuPage);
     if (RT_FAILURE(rc2))
     {
@@ -5160 +5158 @@
 DECLASM(int) VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu)
 {
-    PHMGLOBALCPUINFO pCpu          = NULL;
-    RTHCPHYS         HCPhysCpuPage = 0;
-    int              rc            = VERR_INTERNAL_ERROR_5;
-
-    pCpu = HMR0GetCurrentCpu();
-    HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
+    NOREF(fResume);
+
+    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    RTHCPHYS HCPhysCpuPage = RTR0MemObjGetPagePhysAddr(pCpu->hMemObj, 0);
 
 #ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -5199 +5195 @@
     *(uint32_t *)(pVM->hm.s.vmx.pScratch + 16 + 8) = 1;
 #endif
-    rc = VMXR0Execute64BitsHandler(pVM, pVCpu, pCtx, HM64ON32OP_VMXRCStartVM64, RT_ELEMENTS(aParam), &aParam[0]);
+    int rc = VMXR0Execute64BitsHandler(pVM, pVCpu, pCtx, HM64ON32OP_VMXRCStartVM64, RT_ELEMENTS(aParam), &aParam[0]);
 
 #ifdef VBOX_WITH_CRASHDUMP_MAGIC