Changeset 49481 in vbox for trunk/src/VBox
- Timestamp:
- Nov 14, 2013 3:18:56 PM (11 years ago)
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/EMAll.cpp
r48442 r49481 190 190 pVCpu->em.s.MWait.fWait |= EMMWAIT_FLAG_MONITOR_ACTIVE; 191 191 /** @todo Make use of GCPhys. */ 192 NOREF(GCPhys); 192 193 /** @todo Complete MONITOR implementation. */ 193 194 return VINF_SUCCESS; … … 419 420 DECLINLINE(int) emDisCoreOne(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, RTGCUINTPTR InstrGC, uint32_t *pOpsize) 420 421 { 422 NOREF(pVM); 421 423 return DISInstrWithReader(InstrGC, (DISCPUMODE)pDis->uCpuMode, emReadBytes, pVCpu, pDis, pOpsize); 422 424 } … … 472 474 PDISCPUSTATE pDis, unsigned *pcbInstr) 473 475 { 476 NOREF(pVM); 474 477 Assert(pCtxCore == CPUMGetGuestCtxCore(pVCpu)); 475 478 DISCPUMODE enmCpuMode = CPUMGetGuestDisMode(pVCpu); … … 3352 3355 static int emInterpretSmsw(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize) 3353 3356 { 3357 NOREF(pvFault); NOREF(pcbSize); 3354 3358 DISQPVPARAMVAL param1; 3355 3359 uint64_t cr0 = CPUMGetGuestCR0(pVCpu); -
trunk/src/VBox/VMM/VMMR0/GMMR0.cpp
r44716 r49481 4780 4780 PGMMSHAREDPAGEDESC pPageDesc, PGMMSHAREDREGIONDESC pGlobalRegion) 4781 4781 { 4782 NOREF(pModule); 4783 4782 4784 /* Easy case: just change the internal page type. */ 4783 4785 PGMMPAGE pPage = gmmR0GetPage(pGMM, pPageDesc->idPage); … … 5388 5390 GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM) 5389 5391 { 5392 NOREF(pStats); NOREF(pSession); NOREF(pVM); 5390 5393 /* Currently nothing we can reset at the moment. */ 5391 5394 return VINF_SUCCESS; -
trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp
r49404 r49481 1414 1414 } 1415 1415 1416 PVM pVM = pVCpu->CTX_SUFF(pVM);1417 if (fStepping|| (CPUMGetHyperDR7(pVCpu) & X86_DR7_ENABLED_MASK))1416 if ( fStepping 1417 || (CPUMGetHyperDR7(pVCpu) & X86_DR7_ENABLED_MASK)) 1418 1418 { 1419 1419 /* … … 1673 1673 VMMR0DECL(void) SVMR0ThreadCtxCallback(RTTHREADCTXEVENT enmEvent, PVMCPU pVCpu, bool fGlobalInit) 1674 1674 { 1675 NOREF(fGlobalInit); 1676 1675 1677 switch (enmEvent) 1676 1678 { … … 2094 2096 DECLCALLBACK(int) hmR0SvmCallRing3Callback(PVMCPU pVCpu, VMMCALLRING3 enmOperation, void *pvUser) 2095 2097 { 2098 NOREF(enmOperation); 2099 2096 2100 /* VMMRZCallRing3() already makes sure we never get called as a result of an longjmp due to an assertion, */ 2097 2101 Assert(pVCpu); … … 2251 2255 DECLINLINE(void) hmR0SvmInjectEventVmcb(PVMCPU pVCpu, PSVMVMCB pVmcb, PCPUMCTX pCtx, PSVMEVENT pEvent) 2252 2256 { 2257 NOREF(pCtx); 2258 2253 2259 pVmcb->ctrl.EventInject.u = pEvent->u; 2254 2260 STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedIrqsR0[pEvent->n.u8Vector & MASK_INJECT_IRQ_STAT]); … … 3097 3103 * @param pVM Pointer to the VM. 3098 3104 * @param pVCpu Pointer to the VMCPU. 3099 * @param pCtx Pointer to the guest-CPU context. 3100 */ 3101 static int hmR0SvmRunGuestCodeNormal(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb) 3105 */ 3106 static int hmR0SvmRunGuestCodeNormal(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) 3102 3107 { 3103 3108 SVMTRANSIENT SvmTransient; … … 3167 3172 * @param pVCpu Pointer to the VMCPU. 3168 3173 * @param pCtx Pointer to the guest-CPU context. 3169 * @param pVmcb Pointer to the VM control block. 3170 */ 3171 static int hmR0SvmRunGuestCodeStep(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcb) 3174 */ 3175 static int hmR0SvmRunGuestCodeStep(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) 3172 3176 { 3173 3177 SVMTRANSIENT SvmTransient; … … 3274 3278 3275 3279 int rc; 3276 PSVMVMCB pVmcb = (PSVMVMCB)pVCpu->hm.s.svm.pvVmcb;3277 3280 if (!pVCpu->hm.s.fSingleInstruction && !DBGFIsStepping(pVCpu)) 3278 rc = hmR0SvmRunGuestCodeNormal(pVM, pVCpu, pCtx , pVmcb);3281 rc = hmR0SvmRunGuestCodeNormal(pVM, pVCpu, pCtx); 3279 3282 else 3280 rc = hmR0SvmRunGuestCodeStep(pVM, pVCpu, pCtx , pVmcb);3283 rc = hmR0SvmRunGuestCodeStep(pVM, pVCpu, pCtx); 3281 3284 3282 3285 if (rc == VERR_EM_INTERPRETER) -
trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
r49215 r49481 228 228 DECLEXPORT(void) ModuleTerm(void *hMod) 229 229 { 230 NOREF(hMod); 230 231 LogFlow(("ModuleTerm:\n")); 231 232
Note:
See TracChangeset
for help on using the changeset viewer.