Index: /trunk/include/VBox/vmm/gmm.h =================================================================== --- /trunk/include/VBox/vmm/gmm.h (revision 68006) +++ /trunk/include/VBox/vmm/gmm.h (revision 68007) @@ -400,25 +400,24 @@ GMMR0DECL(void) GMMR0InitPerVMData(PGVM pGVM); GMMR0DECL(void) GMMR0CleanupVM(PGVM pGVM); -GMMR0DECL(int) GMMR0InitialReservation(PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages, +GMMR0DECL(int) GMMR0InitialReservation(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages, GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority); -GMMR0DECL(int) GMMR0UpdateReservation(PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages); +GMMR0DECL(int) GMMR0UpdateReservation(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages); GMMR0DECL(int) GMMR0AllocateHandyPages(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cPagesToUpdate, uint32_t cPagesToAlloc, PGMMPAGEDESC paPages); -GMMR0DECL(int) GMMR0AllocatePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount); +GMMR0DECL(int) GMMR0AllocatePages(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount); GMMR0DECL(int) GMMR0AllocateLargePage(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys); -GMMR0DECL(int) GMMR0FreePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount); -GMMR0DECL(int) GMMR0FreeLargePage(PVM pVM, VMCPUID idCpu, uint32_t idPage); -GMMR0DECL(int) GMMR0BalloonedPages(PVM pVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages); -GMMR0DECL(int) GMMR0MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3); -GMMR0DECL(int) GMMR0SeedChunk(PVM pVM, VMCPUID idCpu, RTR3PTR pvR3); -GMMR0DECL(int) GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, - RTGCPTR GCBaseAddr, uint32_t cbModule, uint32_t cRegions, +GMMR0DECL(int) GMMR0FreePages(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount); +GMMR0DECL(int) GMMR0FreeLargePage(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t idPage); +GMMR0DECL(int) GMMR0BalloonedPages(PGVM pGVM, PVM pVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages); +GMMR0DECL(int) GMMR0MapUnmapChunk(PGVM pGVM, PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3); +GMMR0DECL(int) GMMR0SeedChunk(PGVM pGVM, PVM pVM, VMCPUID idCpu, RTR3PTR pvR3); +GMMR0DECL(int) GMMR0RegisterSharedModule(PGVM pGVM, PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, + char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule, uint32_t cRegions, struct VMMDEVSHAREDREGIONDESC const *paRegions); -GMMR0DECL(int) GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule); -GMMR0DECL(int) GMMR0UnregisterAllSharedModules(PVM pVM, VMCPUID idCpu); -GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, PVMCPU pVCpu); -GMMR0DECL(int) GMMR0ResetSharedModules(PVM pVM, VMCPUID idCpu); -GMMR0DECL(int) GMMR0CheckSharedModulesStart(PVM pVM); -GMMR0DECL(int) GMMR0CheckSharedModulesEnd(PVM pVM); +GMMR0DECL(int) GMMR0UnregisterSharedModule(PGVM pGVM, PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, + RTGCPTR GCBaseAddr, uint32_t cbModule); +GMMR0DECL(int) GMMR0UnregisterAllSharedModules(PGVM pGVM, PVM pVM, VMCPUID idCpu); +GMMR0DECL(int) GMMR0CheckSharedModules(PGVM pGVM, PVM pVM, VMCPUID idCpu); +GMMR0DECL(int) GMMR0ResetSharedModules(PGVM pGVM, PVM pVM, VMCPUID idCpu); GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession); GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession); @@ -441,5 +440,5 @@ typedef GMMINITIALRESERVATIONREQ *PGMMINITIALRESERVATIONREQ; -GMMR0DECL(int) GMMR0InitialReservationReq(PVM pVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq); +GMMR0DECL(int) GMMR0InitialReservationReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq); @@ -459,5 +458,5 @@ typedef GMMUPDATERESERVATIONREQ *PGMMUPDATERESERVATIONREQ; -GMMR0DECL(int) GMMR0UpdateReservationReq(PVM pVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq); +GMMR0DECL(int) GMMR0UpdateReservationReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq); @@ -480,5 +479,5 @@ typedef GMMALLOCATEPAGESREQ *PGMMALLOCATEPAGESREQ; -GMMR0DECL(int) GMMR0AllocatePagesReq(PVM pVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq); +GMMR0DECL(int) GMMR0AllocatePagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq); @@ -501,5 +500,5 @@ typedef GMMFREEPAGESREQ *PGMMFREEPAGESREQ; -GMMR0DECL(int) GMMR0FreePagesReq(PVM pVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq); +GMMR0DECL(int) GMMR0FreePagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq); /** @@ -519,5 +518,5 @@ typedef GMMBALLOONEDPAGESREQ *PGMMBALLOONEDPAGESREQ; -GMMR0DECL(int) GMMR0BalloonedPagesReq(PVM pVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq); +GMMR0DECL(int) GMMR0BalloonedPagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq); @@ -544,6 +543,6 @@ typedef GMMMEMSTATSREQ *PGMMMEMSTATSREQ; -GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq); -GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq); +GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq); +GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq); /** @@ -565,5 +564,5 @@ typedef GMMMAPUNMAPCHUNKREQ *PGMMMAPUNMAPCHUNKREQ; -GMMR0DECL(int) GMMR0MapUnmapChunkReq(PVM pVM, PGMMMAPUNMAPCHUNKREQ pReq); +GMMR0DECL(int) GMMR0MapUnmapChunkReq(PGVM pGVM, PVM pVM, PGMMMAPUNMAPCHUNKREQ pReq); @@ -582,5 +581,5 @@ typedef GMMFREELARGEPAGEREQ *PGMMFREELARGEPAGEREQ; -GMMR0DECL(int) GMMR0FreeLargePageReq(PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq); +GMMR0DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq); /** Maximum length of the shared module name string, terminator included. */ @@ -617,5 +616,5 @@ typedef GMMREGISTERSHAREDMODULEREQ *PGMMREGISTERSHAREDMODULEREQ; -GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq); +GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq); /** @@ -704,5 +703,5 @@ typedef GMMUNREGISTERSHAREDMODULEREQ *PGMMUNREGISTERSHAREDMODULEREQ; -GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq); +GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq); #if defined(VBOX_STRICT) && HC_ARCH_BITS == 64 @@ -723,5 +722,5 @@ typedef GMMFINDDUPLICATEPAGEREQ *PGMMFINDDUPLICATEPAGEREQ; -GMMR0DECL(int) GMMR0FindDuplicatePageReq(PVM pVM, PGMMFINDDUPLICATEPAGEREQ pReq); +GMMR0DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PVM pVM, PGMMFINDDUPLICATEPAGEREQ pReq); #endif /* VBOX_STRICT && HC_ARCH_BITS == 64 */ @@ -744,5 +743,5 @@ typedef GMMQUERYSTATISTICSSREQ *PGMMQUERYSTATISTICSSREQ; -GMMR0DECL(int) GMMR0QueryStatisticsReq(PVM pVM, PGMMQUERYSTATISTICSSREQ pReq); +GMMR0DECL(int) GMMR0QueryStatisticsReq(PGVM pGVM, PVM pVM, PGMMQUERYSTATISTICSSREQ pReq); @@ -765,5 +764,5 @@ typedef GMMRESETSTATISTICSSREQ *PGMMRESETSTATISTICSSREQ; -GMMR0DECL(int) GMMR0ResetStatisticsReq(PVM pVM, PGMMRESETSTATISTICSSREQ pReq); +GMMR0DECL(int) GMMR0ResetStatisticsReq(PGVM pGVM, PVM pVM, PGMMRESETSTATISTICSSREQ pReq); Index: /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (revision 68006) +++ /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (revision 68007) @@ -1540,6 +1540,7 @@ * @retval VERR_GMM_ * + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. - * @param idCpu The VCPU id. + * @param idCpu The VCPU id - must be zero. * @param cBasePages The number of pages that may be allocated for the base RAM and ROMs. * This does not include MMIO2 and similar. @@ -1550,19 +1551,19 @@ * @param enmPriority The priority in an out-of-memory situation. * - * @thread The creator thread / EMT. - */ -GMMR0DECL(int) GMMR0InitialReservation(PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages, - GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority) -{ - LogFlow(("GMMR0InitialReservation: pVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x enmPolicy=%d enmPriority=%d\n", - pVM, cBasePages, cShadowPages, cFixedPages, enmPolicy, enmPriority)); + * @thread The creator thread / EMT(0). + */ +GMMR0DECL(int) GMMR0InitialReservation(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, + uint32_t cFixedPages, GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority) +{ + LogFlow(("GMMR0InitialReservation: pGVM=%p pVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x enmPolicy=%d enmPriority=%d\n", + pGVM, pVM, cBasePages, cShadowPages, cFixedPages, enmPolicy, enmPriority)); /* * Validate, get basics and take the semaphore. */ + AssertReturn(idCpu == 0, VERR_INVALID_CPU_ID); PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -1617,9 +1618,10 @@ * * @returns see GMMR0InitialReservation. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0InitialReservationReq(PVM pVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq) +GMMR0DECL(int) GMMR0InitialReservationReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq) { /* @@ -1630,5 +1632,6 @@ AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0InitialReservation(pVM, idCpu, pReq->cBasePages, pReq->cShadowPages, pReq->cFixedPages, pReq->enmPolicy, pReq->enmPriority); + return GMMR0InitialReservation(pGVM, pVM, idCpu, pReq->cBasePages, pReq->cShadowPages, + pReq->cFixedPages, pReq->enmPolicy, pReq->enmPriority); } @@ -1640,4 +1643,5 @@ * @retval VERR_GMM_MEMORY_RESERVATION_DECLINED * + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -1648,10 +1652,11 @@ * hyper heap, MMIO2 and similar. * - * @thread EMT. - */ -GMMR0DECL(int) GMMR0UpdateReservation(PVM pVM, VMCPUID idCpu, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages) -{ - LogFlow(("GMMR0UpdateReservation: pVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x\n", - pVM, cBasePages, cShadowPages, cFixedPages)); + * @thread EMT(idCpu) + */ +GMMR0DECL(int) GMMR0UpdateReservation(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t cBasePages, + uint32_t cShadowPages, uint32_t cFixedPages) +{ + LogFlow(("GMMR0UpdateReservation: pGVM=%p pVM=%p cBasePages=%#llx cShadowPages=%#x cFixedPages=%#x\n", + pGVM, pVM, cBasePages, cShadowPages, cFixedPages)); /* @@ -1660,6 +1665,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -1711,9 +1715,10 @@ * * @returns see GMMR0UpdateReservation. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0UpdateReservationReq(PVM pVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq) +GMMR0DECL(int) GMMR0UpdateReservationReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq) { /* @@ -1724,5 +1729,5 @@ AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0UpdateReservation(pVM, idCpu, pReq->cBasePages, pReq->cShadowPages, pReq->cFixedPages); + return GMMR0UpdateReservation(pGVM, pVM, idCpu, pReq->cBasePages, pReq->cShadowPages, pReq->cFixedPages); } @@ -2918,4 +2923,5 @@ * that is we're trying to allocate more than we've reserved. * + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -2928,7 +2934,7 @@ * @thread EMT. */ -GMMR0DECL(int) GMMR0AllocatePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount) -{ - LogFlow(("GMMR0AllocatePages: pVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pVM, cPages, paPages, enmAccount)); +GMMR0DECL(int) GMMR0AllocatePages(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMPAGEDESC paPages, GMMACCOUNT enmAccount) +{ + LogFlow(("GMMR0AllocatePages: pGVM=%p pVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pGVM, pVM, cPages, paPages, enmAccount)); /* @@ -2937,6 +2943,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -2984,14 +2989,14 @@ * * @returns see GMMR0AllocatePages. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0AllocatePagesReq(PVM pVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq) +GMMR0DECL(int) GMMR0AllocatePagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq >= RT_UOFFSETOF(GMMALLOCATEPAGESREQ, aPages[0]), @@ -3002,5 +3007,5 @@ VERR_INVALID_PARAMETER); - return GMMR0AllocatePages(pVM, idCpu, pReq->cPages, &pReq->aPages[0], pReq->enmAccount); + return GMMR0AllocatePages(pGVM, pVM, idCpu, pReq->cPages, &pReq->aPages[0], pReq->enmAccount); } @@ -3127,11 +3132,12 @@ * * @returns VBox status code: + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param idPage The large page id. */ -GMMR0DECL(int) GMMR0FreeLargePage(PVM pVM, VMCPUID idCpu, uint32_t idPage) -{ - LogFlow(("GMMR0FreeLargePage: pVM=%p idPage=%x\n", pVM, idPage)); +GMMR0DECL(int) GMMR0FreeLargePage(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t idPage) +{ + LogFlow(("GMMR0FreeLargePage: pGVM=%p pVM=%p idPage=%x\n", pGVM, pVM, idPage)); /* @@ -3140,6 +3146,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -3194,14 +3199,14 @@ * * @returns see GMMR0FreeLargePage. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0FreeLargePageReq(PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq) +GMMR0DECL(int) GMMR0FreeLargePageReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMFREEPAGESREQ), @@ -3209,5 +3214,5 @@ VERR_INVALID_PARAMETER); - return GMMR0FreeLargePage(pVM, idCpu, pReq->idPage); + return GMMR0FreeLargePage(pGVM, pVM, idCpu, pReq->idPage); } @@ -3555,4 +3560,5 @@ * @retval xxx * + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -3563,7 +3569,7 @@ * @thread EMT. */ -GMMR0DECL(int) GMMR0FreePages(PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount) -{ - LogFlow(("GMMR0FreePages: pVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pVM, cPages, paPages, enmAccount)); +GMMR0DECL(int) GMMR0FreePages(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint32_t cPages, PGMMFREEPAGEDESC paPages, GMMACCOUNT enmAccount) +{ + LogFlow(("GMMR0FreePages: pGVM=%p pVM=%p cPages=%#x paPages=%p enmAccount=%d\n", pGVM, pVM, cPages, paPages, enmAccount)); /* @@ -3572,6 +3578,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -3607,14 +3612,14 @@ * * @returns see GMMR0FreePages. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0FreePagesReq(PVM pVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq) +GMMR0DECL(int) GMMR0FreePagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq >= RT_UOFFSETOF(GMMFREEPAGESREQ, aPages[0]), @@ -3625,5 +3630,5 @@ VERR_INVALID_PARAMETER); - return GMMR0FreePages(pVM, idCpu, pReq->cPages, &pReq->aPages[0], pReq->enmAccount); + return GMMR0FreePages(pGVM, pVM, idCpu, pReq->cPages, &pReq->aPages[0], pReq->enmAccount); } @@ -3645,4 +3650,5 @@ * but to hope the VM won't use the memory that was returned to it.) * + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -3650,10 +3656,10 @@ * @param cBalloonedPages The number of pages that was ballooned. * - * @thread EMT. - */ -GMMR0DECL(int) GMMR0BalloonedPages(PVM pVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages) -{ - LogFlow(("GMMR0BalloonedPages: pVM=%p enmAction=%d cBalloonedPages=%#x\n", - pVM, enmAction, cBalloonedPages)); + * @thread EMT(idCpu) + */ +GMMR0DECL(int) GMMR0BalloonedPages(PGVM pGVM, PVM pVM, VMCPUID idCpu, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages) +{ + LogFlow(("GMMR0BalloonedPages: pGVM=%p pVM=%p enmAction=%d cBalloonedPages=%#x\n", + pGVM, pVM, enmAction, cBalloonedPages)); AssertMsgReturn(cBalloonedPages < RT_BIT(32 - PAGE_SHIFT), ("%#x\n", cBalloonedPages), VERR_INVALID_PARAMETER); @@ -3664,6 +3670,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -3777,14 +3782,14 @@ * * @returns see GMMR0BalloonedPages. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0BalloonedPagesReq(PVM pVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq) +GMMR0DECL(int) GMMR0BalloonedPagesReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMBALLOONEDPAGESREQ), @@ -3792,20 +3797,19 @@ VERR_INVALID_PARAMETER); - return GMMR0BalloonedPages(pVM, idCpu, pReq->enmAction, pReq->cBalloonedPages); -} + return GMMR0BalloonedPages(pGVM, pVM, idCpu, pReq->enmAction, pReq->cBalloonedPages); +} + /** * Return memory statistics for the hypervisor * - * @returns VBox status code: - * @param pVM The cross context VM structure. + * @returns VBox status code. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq) +GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PGMMMEMSTATSREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMMEMSTATSREQ), @@ -3828,18 +3832,21 @@ } + /** * Return memory statistics for the VM * - * @returns VBox status code: + * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu Cpu id. * @param pReq Pointer to the request packet. - */ -GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq) + * + * @thread EMT(idCpu) + */ +GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(GMMMEMSTATSREQ), @@ -3852,6 +3859,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -4123,14 +4129,15 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idChunkMap The chunk to map. NIL_GMM_CHUNKID if nothing to map. * @param idChunkUnmap The chunk to unmap. NIL_GMM_CHUNKID if nothing to unmap. * @param ppvR3 Where to store the address of the mapped chunk. NULL is ok if nothing to map. - * @thread EMT - */ -GMMR0DECL(int) GMMR0MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3) -{ - LogFlow(("GMMR0MapUnmapChunk: pVM=%p idChunkMap=%#x idChunkUnmap=%#x ppvR3=%p\n", - pVM, idChunkMap, idChunkUnmap, ppvR3)); + * @thread EMT ??? + */ +GMMR0DECL(int) GMMR0MapUnmapChunk(PGVM pGVM, PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3) +{ + LogFlow(("GMMR0MapUnmapChunk: pGVM=%p pVM=%p idChunkMap=%#x idChunkUnmap=%#x ppvR3=%p\n", + pGVM, pVM, idChunkMap, idChunkUnmap, ppvR3)); /* @@ -4139,6 +4146,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVM(pVM, &pGVM); + int rc = GVMMR0ValidateGVMandVM(pGVM, pVM); if (RT_FAILURE(rc)) return rc; @@ -4215,17 +4221,17 @@ * * @returns see GMMR0MapUnmapChunk. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0MapUnmapChunkReq(PVM pVM, PGMMMAPUNMAPCHUNKREQ pReq) +GMMR0DECL(int) GMMR0MapUnmapChunkReq(PGVM pGVM, PVM pVM, PGMMMAPUNMAPCHUNKREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0MapUnmapChunk(pVM, pReq->idChunkMap, pReq->idChunkUnmap, &pReq->pvR3); + return GMMR0MapUnmapChunk(pGVM, pVM, pReq->idChunkMap, pReq->idChunkUnmap, &pReq->pvR3); } @@ -4238,9 +4244,10 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pvR3 Pointer to the chunk size memory block to lock down. */ -GMMR0DECL(int) GMMR0SeedChunk(PVM pVM, VMCPUID idCpu, RTR3PTR pvR3) +GMMR0DECL(int) GMMR0SeedChunk(PGVM pGVM, PVM pVM, VMCPUID idCpu, RTR3PTR pvR3) { /* @@ -4249,6 +4256,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -4522,4 +4528,5 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -4531,6 +4538,7 @@ * @param cRegions The mumber of shared region descriptors. * @param paRegions Pointer to an array of shared region(s). - */ -GMMR0DECL(int) GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, + * @thread EMT(idCpu) + */ +GMMR0DECL(int) GMMR0RegisterSharedModule(PGVM pGVM, PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCPtrModBase, uint32_t cbModule, uint32_t cRegions, struct VMMDEVSHAREDREGIONDESC const *paRegions) @@ -4545,6 +4553,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -4669,19 +4676,21 @@ * * @returns see GMMR0RegisterSharedModule. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq) +GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); - AssertMsgReturn(pReq->Hdr.cbReq >= sizeof(*pReq) && pReq->Hdr.cbReq == RT_UOFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); + AssertMsgReturn( pReq->Hdr.cbReq >= sizeof(*pReq) + && pReq->Hdr.cbReq == RT_UOFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]), + ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); /* Pass back return code in the request packet to preserve informational codes. (VMMR3CallR0 chokes on them) */ - pReq->rc = GMMR0RegisterSharedModule(pVM, idCpu, pReq->enmGuestOS, pReq->szName, pReq->szVersion, + pReq->rc = GMMR0RegisterSharedModule(pGVM, pVM, idCpu, pReq->enmGuestOS, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions); return VINF_SUCCESS; @@ -4693,4 +4702,5 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. @@ -4700,5 +4710,5 @@ * @param cbModule The module size. */ -GMMR0DECL(int) GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, +GMMR0DECL(int) GMMR0UnregisterSharedModule(PGVM pGVM, PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCPtrModBase, uint32_t cbModule) { @@ -4709,6 +4719,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -4753,5 +4762,5 @@ #else - NOREF(pVM); NOREF(idCpu); NOREF(pszModuleName); NOREF(pszVersion); NOREF(GCPtrModBase); NOREF(cbModule); + NOREF(pGVM); NOREF(pVM); NOREF(idCpu); NOREF(pszModuleName); NOREF(pszVersion); NOREF(GCPtrModBase); NOREF(cbModule); return VERR_NOT_IMPLEMENTED; #endif @@ -4763,18 +4772,18 @@ * * @returns see GMMR0UnregisterSharedModule. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq) +GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0UnregisterSharedModule(pVM, idCpu, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule); + return GMMR0UnregisterSharedModule(pGVM, pVM, idCpu, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule); } @@ -5070,8 +5079,9 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param idCpu The VCPU id. */ -GMMR0DECL(int) GMMR0ResetSharedModules(PVM pVM, VMCPUID idCpu) +GMMR0DECL(int) GMMR0ResetSharedModules(PGVM pGVM, PVM pVM, VMCPUID idCpu) { #ifdef VBOX_WITH_PAGE_SHARING @@ -5081,6 +5091,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -5108,5 +5117,5 @@ return rc; #else - NOREF(pVM); NOREF(idCpu); + RT_NOREF(pGVM, pVM, idCpu); return VERR_NOT_IMPLEMENTED; #endif @@ -5134,14 +5143,17 @@ #endif /* VBOX_WITH_PAGE_SHARING */ -#ifdef DEBUG_sandervl - -/** - * Setup for a GMMR0CheckSharedModules call (to allow log flush jumps back to ring 3) + +/** + * Check all shared modules for the specified VM. * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. - */ -GMMR0DECL(int) GMMR0CheckSharedModulesStart(PVM pVM) -{ + * @param idCpu The calling EMT number. + * @thread EMT(idCpu) + */ +GMMR0DECL(int) GMMR0CheckSharedModules(PGVM pGVM, PVM pVM, VMCPUID idCpu) +{ +#ifdef VBOX_WITH_PAGE_SHARING /* * Validate input and get the basics. @@ -5149,54 +5161,5 @@ PGMM pGMM; GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - - /* - * Take the semaphore and do some more validations. - */ - gmmR0MutexAcquire(pGMM); - if (!GMM_CHECK_SANITY_UPON_ENTERING(pGMM)) - rc = VERR_GMM_IS_NOT_SANE; - else - rc = VINF_SUCCESS; - - return rc; -} - -/** - * Clean up after a GMMR0CheckSharedModules call (to allow log flush jumps back to ring 3) - * - * @returns VBox status code. - * @param pVM The cross context VM structure. - */ -GMMR0DECL(int) GMMR0CheckSharedModulesEnd(PVM pVM) -{ - /* - * Validate input and get the basics. - */ - PGMM pGMM; - GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - - gmmR0MutexRelease(pGMM); - return VINF_SUCCESS; -} - -#endif /* DEBUG_sandervl */ - -/** - * Check all shared modules for the specified VM. - * - * @returns VBox status code. - * @param pVM The cross context VM structure. - * @param pVCpu The cross context virtual CPU structure. - */ -GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, PVMCPU pVCpu) -{ -#ifdef VBOX_WITH_PAGE_SHARING - /* - * Validate input and get the basics. - */ - PGMM pGMM; - GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVMAndEMT(pVM, pVCpu->idCpu, &pGVM); + int rc = GVMMR0ValidateGVMandVMandEMT(pGVM, pVM, idCpu); if (RT_FAILURE(rc)) return rc; @@ -5217,5 +5180,5 @@ GMMCHECKSHAREDMODULEINFO Args; Args.pGVM = pGVM; - Args.idCpu = pVCpu->idCpu; + Args.idCpu = idCpu; rc = RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Args); @@ -5287,13 +5250,13 @@ * * @returns VBox status code. + * @param pGVM The global (ring-0) VM structure. * @param pVM The cross context VM structure. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0FindDuplicatePageReq(PVM pVM, PGMMFINDDUPLICATEPAGEREQ pReq) +GMMR0DECL(int) GMMR0FindDuplicatePageReq(PGVM pGVM, PVM pVM, PGMMFINDDUPLICATEPAGEREQ pReq) { /* * Validate input and pass it on. */ - AssertPtrReturn(pVM, VERR_INVALID_POINTER); AssertPtrReturn(pReq, VERR_INVALID_POINTER); AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); @@ -5302,6 +5265,5 @@ GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE); - PGVM pGVM; - int rc = GVMMR0ByVM(pVM, &pGVM); + int rc = GVMMR0ValidateGVMandVM(pGVM, pVM); if (RT_FAILURE(rc)) return rc; @@ -5361,9 +5323,10 @@ * @param pStats Where to put the statistics. * @param pSession The current session. - * @param pVM The VM to obtain statistics for. Optional. - */ -GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM) -{ - LogFlow(("GVMMR0QueryStatistics: pStats=%p pSession=%p pVM=%p\n", pStats, pSession, pVM)); + * @param pGVM The GVM to obtain statistics for. Optional. + * @param pVM The VM structure corresponding to @a pGVM. + */ +GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM, PVM pVM) +{ + LogFlow(("GVMMR0QueryStatistics: pStats=%p pSession=%p pGVM=%p pVM=%p\n", pStats, pSession, pGVM, pVM)); /* @@ -5378,16 +5341,13 @@ /* - * Resolve the VM handle, if not NULL, and lock the GMM. + * Validate the VM handle, if not NULL, and lock the GMM. */ int rc; - PGVM pGVM; - if (pVM) - { - rc = GVMMR0ByVM(pVM, &pGVM); + if (pGVM) + { + rc = GVMMR0ValidateGVMandVM(pGVM, pVM); if (RT_FAILURE(rc)) return rc; } - else - pGVM = NULL; rc = gmmR0MutexAcquire(pGMM); @@ -5428,8 +5388,9 @@ * * @returns see GMMR0QueryStatistics. + * @param pGVM The global (ring-0) VM structure. Optional. * @param pVM The cross context VM structure. Optional. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0QueryStatisticsReq(PVM pVM, PGMMQUERYSTATISTICSSREQ pReq) +GMMR0DECL(int) GMMR0QueryStatisticsReq(PGVM pGVM, PVM pVM, PGMMQUERYSTATISTICSSREQ pReq) { /* @@ -5439,5 +5400,5 @@ AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0QueryStatistics(&pReq->Stats, pReq->pSession, pVM); + return GMMR0QueryStatistics(&pReq->Stats, pReq->pSession, pGVM, pVM); } @@ -5451,9 +5412,10 @@ * indicates which to reset. * @param pSession The current session. - * @param pVM The VM to reset statistics for. Optional. - */ -GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM) -{ - NOREF(pStats); NOREF(pSession); NOREF(pVM); + * @param pGVM The GVM to reset statistics for. Optional. + * @param pVM The VM structure corresponding to @a pGVM. + */ +GMMR0DECL(int) GMMR0ResetStatistics(PCGMMSTATS pStats, PSUPDRVSESSION pSession, PGVM pGVM, PVM pVM) +{ + NOREF(pStats); NOREF(pSession); NOREF(pVM); NOREF(pGVM); /* Currently nothing we can reset at the moment. */ return VINF_SUCCESS; @@ -5465,8 +5427,9 @@ * * @returns see GMMR0ResetStatistics. + * @param pGVM The global (ring-0) VM structure. Optional. * @param pVM The cross context VM structure. Optional. * @param pReq Pointer to the request packet. */ -GMMR0DECL(int) GMMR0ResetStatisticsReq(PVM pVM, PGMMRESETSTATISTICSSREQ pReq) +GMMR0DECL(int) GMMR0ResetStatisticsReq(PGVM pGVM, PVM pVM, PGMMRESETSTATISTICSSREQ pReq) { /* @@ -5476,5 +5439,5 @@ AssertMsgReturn(pReq->Hdr.cbReq == sizeof(*pReq), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER); - return GMMR0ResetStatistics(&pReq->Stats, pReq->pSession, pVM); -} - + return GMMR0ResetStatistics(&pReq->Stats, pReq->pSession, pGVM, pVM); +} + Index: /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (revision 68006) +++ /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (revision 68007) @@ -2396,5 +2396,4 @@ * @param pVM The cross context VM structure. * @param idCpu The Virtual CPU ID of the EMT to wake up. - * @param fTakeUsedLock Take the used lock or not * @thread Any but EMT(idCpu). * @deprecated Don't use in new code if possible! Use the GVM variant. Index: /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (revision 68006) +++ /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (revision 68007) @@ -1665,5 +1665,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0InitialReservationReq(pVM, idCpu, (PGMMINITIALRESERVATIONREQ)pReqHdr); + rc = GMMR0InitialReservationReq(pGVM, pVM, idCpu, (PGMMINITIALRESERVATIONREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1672,5 +1672,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0UpdateReservationReq(pVM, idCpu, (PGMMUPDATERESERVATIONREQ)pReqHdr); + rc = GMMR0UpdateReservationReq(pGVM, pVM, idCpu, (PGMMUPDATERESERVATIONREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1679,5 +1679,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0AllocatePagesReq(pVM, idCpu, (PGMMALLOCATEPAGESREQ)pReqHdr); + rc = GMMR0AllocatePagesReq(pGVM, pVM, idCpu, (PGMMALLOCATEPAGESREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1686,5 +1686,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0FreePagesReq(pVM, idCpu, (PGMMFREEPAGESREQ)pReqHdr); + rc = GMMR0FreePagesReq(pGVM, pVM, idCpu, (PGMMFREEPAGESREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1693,5 +1693,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0FreeLargePageReq(pVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr); + rc = GMMR0FreeLargePageReq(pGVM, pVM, idCpu, (PGMMFREELARGEPAGEREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1700,5 +1700,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0QueryHypervisorMemoryStatsReq(pVM, (PGMMMEMSTATSREQ)pReqHdr); + rc = GMMR0QueryHypervisorMemoryStatsReq((PGMMMEMSTATSREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1709,5 +1709,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0QueryMemoryStatsReq(pVM, idCpu, (PGMMMEMSTATSREQ)pReqHdr); + rc = GMMR0QueryMemoryStatsReq(pGVM, pVM, idCpu, (PGMMMEMSTATSREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1716,5 +1716,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0BalloonedPagesReq(pVM, idCpu, (PGMMBALLOONEDPAGESREQ)pReqHdr); + rc = GMMR0BalloonedPagesReq(pGVM, pVM, idCpu, (PGMMBALLOONEDPAGESREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1723,5 +1723,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0MapUnmapChunkReq(pVM, (PGMMMAPUNMAPCHUNKREQ)pReqHdr); + rc = GMMR0MapUnmapChunkReq(pGVM, pVM, (PGMMMAPUNMAPCHUNKREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1730,5 +1730,5 @@ if (pReqHdr) return VERR_INVALID_PARAMETER; - rc = GMMR0SeedChunk(pVM, idCpu, (RTR3PTR)u64Arg); + rc = GMMR0SeedChunk(pGVM, pVM, idCpu, (RTR3PTR)u64Arg); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1739,5 +1739,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0RegisterSharedModuleReq(pVM, idCpu, (PGMMREGISTERSHAREDMODULEREQ)pReqHdr); + rc = GMMR0RegisterSharedModuleReq(pGVM, pVM, idCpu, (PGMMREGISTERSHAREDMODULEREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1748,5 +1748,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0UnregisterSharedModuleReq(pVM, idCpu, (PGMMUNREGISTERSHAREDMODULEREQ)pReqHdr); + rc = GMMR0UnregisterSharedModuleReq(pGVM, pVM, idCpu, (PGMMUNREGISTERSHAREDMODULEREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1758,5 +1758,5 @@ || pReqHdr) return VERR_INVALID_PARAMETER; - rc = GMMR0ResetSharedModules(pVM, idCpu); + rc = GMMR0ResetSharedModules(pGVM, pVM, idCpu); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1770,22 +1770,5 @@ || pReqHdr) return VERR_INVALID_PARAMETER; - - PVMCPU pVCpu = &pVM->aCpus[idCpu]; - Assert(pVCpu->hNativeThreadR0 == RTThreadNativeSelf()); - -# ifdef DEBUG_sandervl - /* Make sure that log flushes can jump back to ring-3; annoying to get an incomplete log (this is risky though as the code doesn't take this into account). */ - /** @todo this can have bad side effects for unexpected jumps back to r3. */ - rc = GMMR0CheckSharedModulesStart(pVM); - if (rc == VINF_SUCCESS) - { - rc = vmmR0CallRing3SetJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, GMMR0CheckSharedModules, pVM, pVCpu); /* this may resume code. */ - Assert( rc == VINF_SUCCESS - || (rc == VINF_VMM_CALL_HOST && pVCpu->vmm.s.enmCallRing3Operation == VMMCALLRING3_VMM_LOGGER_FLUSH)); - GMMR0CheckSharedModulesEnd(pVM); - } -# else - rc = GMMR0CheckSharedModules(pVM, pVCpu); -# endif + rc = GMMR0CheckSharedModules(pGVM, pVM, idCpu); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1797,5 +1780,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0FindDuplicatePageReq(pVM, (PGMMFINDDUPLICATEPAGEREQ)pReqHdr); + rc = GMMR0FindDuplicatePageReq(pGVM, pVM, (PGMMFINDDUPLICATEPAGEREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1805,5 +1788,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0QueryStatisticsReq(pVM, (PGMMQUERYSTATISTICSSREQ)pReqHdr); + rc = GMMR0QueryStatisticsReq(pGVM, pVM, (PGMMQUERYSTATISTICSSREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break; @@ -1812,5 +1795,5 @@ if (u64Arg) return VERR_INVALID_PARAMETER; - rc = GMMR0ResetStatisticsReq(pVM, (PGMMRESETSTATISTICSSREQ)pReqHdr); + rc = GMMR0ResetStatisticsReq(pGVM, pVM, (PGMMRESETSTATISTICSSREQ)pReqHdr); VMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING); break;