儲存庫 vbox 的更動 62656

時間撮記:

2016-7-28 下午10:26:10 (8 年 以前)

作者:

vboxsync

訊息:

VMMR3: warnings

檔案:

• trunk/src/VBox/VMM/VMMR3/APIC.cpp (修改) (8 筆差異)

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -942 +942 @@
  *
  * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pSSM        The SSM handle.
  * @param   uVersion    Data layout version.
  */
-static int apicR3LoadLegacyVCpuData(PVM pVM, PVMCPU pVCpu, PSSMHANDLE pSSM, uint32_t uVersion)
+static int apicR3LoadLegacyVCpuData(PVMCPU pVCpu, PSSMHANDLE pSSM, uint32_t uVersion)
 {
     AssertReturn(uVersion <= APIC_SAVED_STATE_VERSION_VBOX_50, VERR_NOT_SUPPORTED);
@@ -1056 +1055 @@
     PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
     PVM      pVM      = PDMDevHlpGetVM(pApicDev->pDevInsR3);
+    RT_NOREF1(uPass);
 
     LogFlow(("APIC: apicR3LiveExec: uPass=%u\n", uPass));
@@ -1070 +1070 @@
 static DECLCALLBACK(int) apicR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
-    PVM      pVM      = PDMDevHlpGetVM(pDevIns);
-    PAPIC    pApic    = VM_TO_APIC(pVM);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     AssertReturn(pVM, VERR_INVALID_VM_HANDLE);
 
@@ -1127 +1125 @@
 static DECLCALLBACK(int) apicR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
-    PVM      pVM      = PDMDevHlpGetVM(pDevIns);
-    PAPIC    pApic    = VM_TO_APIC(pVM);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
 
     AssertReturn(pVM, VERR_INVALID_VM_HANDLE);
@@ -1196 +1192 @@
         else
         {
-            rc = apicR3LoadLegacyVCpuData(pVM, pVCpu, pSSM, uVersion);
+            rc = apicR3LoadLegacyVCpuData(pVCpu, pSSM, uVersion);
             AssertRCReturn(rc, rc);
         }
@@ -1235 +1231 @@
     Assert(pVCpu);
     LogFlow(("APIC%u: apicR3TimerCallback\n", pVCpu->idCpu));
+    RT_NOREF2(pDevIns, pTimer);
 
     PXAPICPAGE     pXApicPage = VMCPU_TO_XAPICPAGE(pVCpu);
+    uint32_t const uLvtTimer  = pXApicPage->lvt_timer.all.u32LvtTimer;
+#ifdef VBOX_WITH_STATISTICS
     PAPICCPU       pApicCpu   = VMCPU_TO_APICCPU(pVCpu);
-    uint32_t const uLvtTimer  = pXApicPage->lvt_timer.all.u32LvtTimer;
     STAM_COUNTER_INC(&pApicCpu->StatTimerCallback);
+#endif
     if (!XAPIC_LVT_IS_MASKED(uLvtTimer))
     {
@@ -1284 +1283 @@
 static DECLCALLBACK(void) apicR3Reset(PPDMDEVINS pDevIns)
 {
-    PAPICDEV pApicDev = PDMINS_2_DATA(pDevIns, PAPICDEV);
-    PVM      pVM      = PDMDevHlpGetVM(pDevIns);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     VM_ASSERT_EMT0(pVM);
     VM_ASSERT_IS_NOT_RUNNING(pVM);
@@ -1584 +1582 @@
      * Validate inputs.
      */
-    Assert(iInstance == 0);
+    Assert(iInstance == 0); NOREF(iInstance);
     Assert(pDevIns);