Index: /trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c (revision 41775) +++ /trunk/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c (revision 41776) @@ -335,5 +335,5 @@ if (pTimer->interval == 0) { - /* @todo use gethrtime_max instead of LLONG_MAX? */ + /** @todo use gethrtime_max instead of LLONG_MAX? */ AssertCompileSize(pSingleTimer->hFireTime.cyt_interval, sizeof(long long)); pSingleTimer->hFireTime.cyt_interval = LLONG_MAX - pSingleTimer->hFireTime.cyt_when; Index: /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (revision 41775) +++ /trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (revision 41776) @@ -1339,5 +1339,5 @@ * Scan one chunk for private pages belonging to the specified VM. * - * @note This function may drop the gian mutex! + * @note This function may drop the giant mutex! * * @returns @c true if we've temporarily dropped the giant mutex, @c false if @@ -1484,6 +1484,6 @@ * @retval VERR_GMM_ * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param cBasePages The number of pages that may be allocated for the base RAM and ROMs. * This does not include MMIO2 and similar. @@ -1561,7 +1561,7 @@ * * @returns see GMMR0InitialReservation. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0InitialReservationReq(PVM pVM, VMCPUID idCpu, PGMMINITIALRESERVATIONREQ pReq) @@ -1584,6 +1584,6 @@ * @retval VERR_GMM_MEMORY_RESERVATION_DECLINED * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param cBasePages The number of pages that may be allocated for the base RAM and ROMs. * This does not include MMIO2 and similar. @@ -1655,7 +1655,7 @@ * * @returns see GMMR0UpdateReservation. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0UpdateReservationReq(PVM pVM, VMCPUID idCpu, PGMMUPDATERESERVATIONREQ pReq) @@ -2024,5 +2024,5 @@ * @returns The new page descriptor table index. * @param pGMM Pointer to the GMM instance data. - * @param hGVM The VM handle. + * @param hGVM The global VM handle. * @param pChunk The chunk. * @param iPage The current page descriptor table index. @@ -2417,5 +2417,5 @@ * * @param pGMM Pointer to the GMM instance data. - * @param pGVM Pointer to the shared VM structure. + * @param pGVM Pointer to the VM. * @param cPages The number of pages to allocate. * @param paPages Pointer to the page descriptors. @@ -2630,6 +2630,6 @@ * that is we're trying to allocate more than we've reserved. * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param cPagesToUpdate The number of pages to update (starting from the head). * @param cPagesToAlloc The number of pages to allocate (starting from the head). @@ -2815,5 +2815,5 @@ * * This is typically used for ROMs and MMIO2 (VRAM) during VM creation. - * The allocated pages are not cleared and will contains random garbage. + * The allocated pages are not cleared and will contain random garbage. * * @returns VBox status code: @@ -2825,6 +2825,6 @@ * that is we're trying to allocate more than we've reserved. * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param cPages The number of pages to allocate. * @param paPages Pointer to the page descriptors. @@ -2890,7 +2890,7 @@ * * @returns see GMMR0AllocatePages. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0AllocatePagesReq(PVM pVM, VMCPUID idCpu, PGMMALLOCATEPAGESREQ pReq) @@ -2925,7 +2925,7 @@ * that is we're trying to allocate more than we've reserved. * @returns see GMMR0AllocatePages. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param cbPage Large page size + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param cbPage Large page size. */ GMMR0DECL(int) GMMR0AllocateLargePage(PVM pVM, VMCPUID idCpu, uint32_t cbPage, uint32_t *pIdPage, RTHCPHYS *pHCPhys) @@ -3027,10 +3027,10 @@ /** - * Free a large page + * Free a large page. * * @returns VBox status code: - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param idPage Large page id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param idPage The large page id. */ GMMR0DECL(int) GMMR0FreeLargePage(PVM pVM, VMCPUID idCpu, uint32_t idPage) @@ -3097,7 +3097,7 @@ * * @returns see GMMR0FreeLargePage. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0FreeLargePageReq(PVM pVM, VMCPUID idCpu, PGMMFREELARGEPAGEREQ pReq) @@ -3276,5 +3276,5 @@ * @param pGMM Pointer to the GMM instance. * @param pGVM Pointer to the GVM instance. - * @param idPage The Page ID + * @param idPage The page id. * @param pPage The page structure. */ @@ -3310,5 +3310,5 @@ * @param pGMM Pointer to the GMM instance. * @param pGVM Pointer to the GVM instance. - * @param idPage The Page ID + * @param idPage The page id. * @param pPage The page structure. */ @@ -3334,5 +3334,5 @@ * * @param pGMM Pointer to the GMM instance data. - * @param pGVM Pointer to the shared VM structure. + * @param pGVM Pointer to the VM. * @param cPages The number of pages to free. * @param paPages Pointer to the page descriptors. @@ -3458,6 +3458,6 @@ * @retval xxx * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param cPages The number of pages to allocate. * @param paPages Pointer to the page descriptors containing the Page IDs for each page. @@ -3509,7 +3509,7 @@ * * @returns see GMMR0FreePages. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0FreePagesReq(PVM pVM, VMCPUID idCpu, PGMMFREEPAGESREQ pReq) @@ -3547,7 +3547,7 @@ * but to hope the VM won't use the memory that was returned to it.) * - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param enmAction Inflate/deflate/reset + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param enmAction Inflate/deflate/reset. * @param cBalloonedPages The number of pages that was ballooned. * @@ -3679,7 +3679,7 @@ * * @returns see GMMR0BalloonedPages. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0BalloonedPagesReq(PVM pVM, VMCPUID idCpu, PGMMBALLOONEDPAGESREQ pReq) @@ -3701,6 +3701,6 @@ * * @returns VBox status code: - * @param pVM Pointer to the shared VM structure. - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0QueryHypervisorMemoryStatsReq(PVM pVM, PGMMMEMSTATSREQ pReq) @@ -3734,7 +3734,7 @@ * * @returns VBox status code: - * @param pVM Pointer to the shared VM structure. + * @param pVM Pointer to the VM. * @parma idCpu Cpu id. - * @param pReq The request packet. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0QueryMemoryStatsReq(PVM pVM, VMCPUID idCpu, PGMMMEMSTATSREQ pReq) @@ -4115,6 +4115,6 @@ * * @returns see GMMR0MapUnmapChunk. - * @param pVM Pointer to the shared VM structure. - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0MapUnmapChunkReq(PVM pVM, PGMMMAPUNMAPCHUNKREQ pReq) @@ -4138,6 +4138,6 @@ * * @returns VBox status code. - * @param pVM The VM. - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. * @param pvR3 Pointer to the chunk size memory block to lock down. */ @@ -4419,13 +4419,13 @@ * * @returns VBox status code. - * @param pVM VM handle - * @param idCpu VCPU id - * @param enmGuestOS Guest OS type - * @param pszModuleName Module name - * @param pszVersion Module version - * @param GCPtrModBase Module base address - * @param cbModule Module size - * @param cRegions Number of shared region descriptors - * @param paRegions Shared region(s) + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param enmGuestOS The guest OS type. + * @param pszModuleName The module name. + * @param pszVersion The module version. + * @param GCPtrModBase The module base address. + * @param cbModule The module size. + * @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, @@ -4566,7 +4566,7 @@ * * @returns see GMMR0RegisterSharedModule. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0RegisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMREGISTERSHAREDMODULEREQ pReq) @@ -4590,10 +4590,10 @@ * * @returns VBox status code. - * @param pVM VM handle - * @param idCpu VCPU id - * @param pszModuleName Module name - * @param pszVersion Module version - * @param GCPtrModBase Module base address - * @param cbModule Module size + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pszModuleName The module name. + * @param pszVersion The module version. + * @param GCPtrModBase The module base address. + * @param cbModule The module size. */ GMMR0DECL(int) GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, @@ -4659,7 +4659,7 @@ * * @returns see GMMR0UnregisterSharedModule. - * @param pVM Pointer to the shared VM structure. - * @param idCpu VCPU id - * @param pReq The request packet. + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0UnregisterSharedModuleReq(PVM pVM, VMCPUID idCpu, PGMMUNREGISTERSHAREDMODULEREQ pReq) @@ -4960,6 +4960,6 @@ * * @returns VBox status code. - * @param pVM VM handle - * @param idCpu VCPU id + * @param pVM Pointer to the VM. + * @param idCpu The VCPU id. */ GMMR0DECL(int) GMMR0ResetSharedModules(PVM pVM, VMCPUID idCpu) @@ -5030,5 +5030,5 @@ * * @returns VBox status code. - * @param pVM VM handle + * @param pVM Pointer to the VM. */ GMMR0DECL(int) GMMR0CheckSharedModulesStart(PVM pVM) @@ -5056,5 +5056,5 @@ * * @returns VBox status code. - * @param pVM VM handle + * @param pVM Pointer to the VM. */ GMMR0DECL(int) GMMR0CheckSharedModulesEnd(PVM pVM) @@ -5076,6 +5076,6 @@ * * @returns VBox status code. - * @param pVM VM handle - * @param pVCpu VMCPU handle + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. */ GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, PVMCPU pVCpu) @@ -5177,6 +5177,6 @@ * * @returns VBox status code. - * @param pVM VM handle - * @param pReq Request packet + * @param pVM Pointer to the VM. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0FindDuplicatePageReq(PVM pVM, PGMMFINDDUPLICATEPAGEREQ pReq) @@ -5251,5 +5251,5 @@ * @param pStats Where to put the statistics. * @param pSession The current session. - * @param pVM The VM to obtain statistics for. Optional. + * @param pVM Pointer to the VM to obtain statistics for. Optional. */ GMMR0DECL(int) GMMR0QueryStatistics(PGMMSTATS pStats, PSUPDRVSESSION pSession, PVM pVM) @@ -5318,6 +5318,6 @@ * * @returns see GMMR0QueryStatistics. - * @param pVM Pointer to the shared VM structure. Optional. - * @param pReq The request packet. + * @param pVM Pointer to the VM. Optional. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0QueryStatisticsReq(PVM pVM, PGMMQUERYSTATISTICSSREQ pReq) @@ -5354,6 +5354,6 @@ * * @returns see GMMR0ResetStatistics. - * @param pVM Pointer to the shared VM structure. Optional. - * @param pReq The request packet. + * @param pVM Pointer to the VM. Optional. + * @param pReq Pointer to the request packet. */ GMMR0DECL(int) GMMR0ResetStatisticsReq(PVM pVM, PGMMRESETSTATISTICSSREQ pReq) Index: /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (revision 41775) +++ /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (revision 41776) @@ -538,5 +538,5 @@ /** - * AMD specific initialization code. + * AMD-specific initialization code. */ static void hmR0InitAmd(uint32_t u32FeaturesEDX) @@ -851,5 +851,5 @@ * * @returns VBox status code. - * @param pVM VM handle (can be 0!) + * @param pVM Pointer to the VM (can be 0). * @param idCpu The identifier for the CPU the function is called on. */ @@ -903,6 +903,6 @@ * RTOnce callback employed by HWACCMR0EnableAllCpus. * - * @returns VBox status code - * @param pvUser The VM handle. + * @returns VBox status code. + * @param pvUser Pointer to the VM. * @param pvUserIgnore NULL, ignored. */ @@ -991,5 +991,5 @@ * * @returns VBox status code. - * @param pVM The VM handle. + * @param pVM Pointer to the VM. */ VMMR0DECL(int) HWACCMR0EnableAllCpus(PVM pVM) @@ -1005,5 +1005,5 @@ /** - * Disable VT-x or AMD-V on the current CPU + * Disable VT-x or AMD-V on the current CPU. * * @returns VBox status code. @@ -1099,6 +1099,6 @@ * Called whenever a system power state change occurs. * - * @param enmEvent Power event - * @param pvUser User argument + * @param enmEvent The Power event. + * @param pvUser User argument. */ static DECLCALLBACK(void) hmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser) @@ -1170,5 +1170,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM Pointer to the VM. */ VMMR0DECL(int) HWACCMR0InitVM(PVM pVM) @@ -1267,5 +1267,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM Pointer to the VM. */ VMMR0DECL(int) HWACCMR0TermVM(PVM pVM) @@ -1305,5 +1305,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM Pointer to the VM. */ VMMR0DECL(int) HWACCMR0SetupVM(PVM pVM) @@ -1356,9 +1356,9 @@ /** - * Enters the VT-x or AMD-V session + * Enters the VT-x or AMD-V session. * * @returns VBox status code. - * @param pVM The VM to operate on. - * @param pVCpu VMCPU handle. + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. * * @remarks This is called with preemption disabled. @@ -1430,9 +1430,9 @@ /** - * Leaves the VT-x or AMD-V session + * Leaves the VT-x or AMD-V session. * * @returns VBox status code. - * @param pVM The VM to operate on. - * @param pVCpu VMCPU handle. + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. * * @remarks Called with preemption disabled just like HWACCMR0Enter, our @@ -1506,5 +1506,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM Pointer to the VM. * @param pVCpu VMCPUD id. * @@ -1540,7 +1540,7 @@ * * @returns VBox status code. - * @param pVM VM handle. - * @param pVCpu VMCPU handle. - * @param pCtx CPU context + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. + * @param pCtx Pointer to the guest CPU context. */ VMMR0DECL(int) HWACCMR0SaveFPUState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) @@ -1557,7 +1557,7 @@ * * @returns VBox status code. - * @param pVM VM handle. - * @param pVCpu VMCPU handle. - * @param pCtx CPU context + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. + * @param pCtx Pointer to the guest CPU context. */ VMMR0DECL(int) HWACCMR0SaveDebugState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) @@ -1571,8 +1571,8 @@ /** - * Test the 32->64 bits switcher + * Test the 32->64 bits switcher. * * @returns VBox status code. - * @param pVM VM handle. + * @param pVM Pointer to the VM. */ VMMR0DECL(int) HWACCMR0TestSwitcher3264(PVM pVM) @@ -1596,7 +1596,7 @@ /** - * Returns suspend status of the host - * - * @returns Suspend pending or not + * Returns suspend status of the host. + * + * @returns Suspend pending or not. */ VMMR0DECL(bool) HWACCMR0SuspendPending(void) @@ -1610,5 +1610,5 @@ * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!). * - * @returns cpu structure pointer + * @returns The cpu structure pointer. */ VMMR0DECL(PHMGLOBLCPUINFO) HWACCMR0GetCurrentCpu(void) @@ -1624,6 +1624,6 @@ * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!). * - * @returns cpu structure pointer - * @param idCpu id of the VCPU + * @returns The cpu structure pointer. + * @param idCpu id of the VCPU. */ VMMR0DECL(PHMGLOBLCPUINFO) HWACCMR0GetCurrentCpuEx(RTCPUID idCpu) @@ -1637,10 +1637,10 @@ * Save a pending IO read. * - * @param pVCpu The VMCPU to operate on. - * @param GCPtrRip Address of IO instruction - * @param GCPtrRipNext Address of the next instruction - * @param uPort Port address - * @param uAndVal And mask for saving the result in eax - * @param cbSize Read size + * @param pVCpu Pointer to the VMCPU. + * @param GCPtrRip Address of IO instruction. + * @param GCPtrRipNext Address of the next instruction. + * @param uPort Port address. + * @param uAndVal AND mask for saving the result in eax. + * @param cbSize Read size. */ VMMR0DECL(void) HWACCMR0SavePendingIOPortRead(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize) @@ -1659,9 +1659,9 @@ * Save a pending IO write. * - * @param pVCpu The VMCPU to operate on. - * @param GCPtrRIP Address of IO instruction - * @param uPort Port address - * @param uAndVal And mask for fetching the result from eax - * @param cbSize Read size + * @param pVCpu Pointer to the VMCPU. + * @param GCPtrRIP Address of IO instruction. + * @param uPort Port address. + * @param uAndVal AND mask for fetching the result from eax. + * @param cbSize Read size. */ VMMR0DECL(void) HWACCMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize) @@ -1682,6 +1682,6 @@ * * @returns VBox status code. - * @param pVM VM handle. - * @param pfVTxDisabled VT-x was disabled or not (out). + * @param pVM Pointer to the VM. + * @param pfVTxDisabled Where to store whether VT-x was disabled or not. */ VMMR0DECL(int) HWACCMR0EnterSwitcher(PVM pVM, bool *pfVTxDisabled) @@ -1727,6 +1727,6 @@ * * @returns VBox status code. - * @param pVM VM handle. - * @param fVTxDisabled VT-x was disabled or not. + * @param pVM Pointer to the VM. + * @param fVTxDisabled Whether VT-x was disabled or not. */ VMMR0DECL(int) HWACCMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled) @@ -1755,6 +1755,6 @@ * * @param pDesc Descriptor to dump. - * @param Sel Selector number. - * @param pszMsg Message to prepend the log entry with. + * @param Sel Selector number. + * @param pszMsg Message to prepend the log entry with. */ VMMR0DECL(void) HWACCMR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg) @@ -1877,7 +1877,7 @@ * Formats a full register dump. * - * @param pVM The VM to operate on. - * @param pVCpu The VMCPU to operate on. - * @param pCtx The context to format. + * @param pVM Pointer to the VM. + * @param pVCpu Pointer to the VMCPU. + * @param pCtx Pointer to the CPU context. */ VMMR0DECL(void) HWACCMDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)