Index: /trunk/Doxyfile.Core =================================================================== --- /trunk/Doxyfile.Core (revision 25646) +++ /trunk/Doxyfile.Core (revision 25647) @@ -571,5 +571,6 @@ VMMRCDECL \ VMMR0DECL \ - VMMR3DECL + VMMR3DECL \ + VMM_INT_DECL SKIP_FUNCTION_MACROS = NO Index: /trunk/Makefile.kmk =================================================================== --- /trunk/Makefile.kmk (revision 25646) +++ /trunk/Makefile.kmk (revision 25647) @@ -450,7 +450,11 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ include/iprt \ + include/iprt/cpp \ + include/iprt/linux \ include/VBox \ include/VBox/com \ include/VBox/HostServices \ + include/VBox/GuestHost \ + include/VBox/HGSMI \ src/VBox/VMM \ src/VBox/VMM/VMMR0 \ Index: /trunk/include/VBox/HostServices/GuestPropertySvc.h =================================================================== --- /trunk/include/VBox/HostServices/GuestPropertySvc.h (revision 25646) +++ /trunk/include/VBox/HostServices/GuestPropertySvc.h (revision 25647) @@ -417,5 +417,5 @@ /** * Array of patterns to match the properties against, separated by '|' - * characters. For backwards compatibility, '\0' is also accepted + * characters. For backwards compatibility, '\\0' is also accepted * as a separater. * (IN pointer) Index: /trunk/include/VBox/VBoxHDD-Plugin.h =================================================================== --- /trunk/include/VBox/VBoxHDD-Plugin.h (revision 25646) +++ /trunk/include/VBox/VBoxHDD-Plugin.h (revision 25647) @@ -548,5 +548,5 @@ /** The prefix to identify Storage Plugins. */ #define VBOX_HDDFORMAT_PLUGIN_PREFIX "VBoxHDD" -/** The size of the prefix excluding the '\0' terminator. */ +/** The size of the prefix excluding the '\\0' terminator. */ #define VBOX_HDDFORMAT_PLUGIN_PREFIX_LENGTH (sizeof(VBOX_HDDFORMAT_PLUGIN_PREFIX)-1) Index: /trunk/include/VBox/VBoxHDD.h =================================================================== --- /trunk/include/VBox/VBoxHDD.h (revision 25646) +++ /trunk/include/VBox/VBoxHDD.h (revision 25647) @@ -135,5 +135,5 @@ typedef struct VBOXHDDRAW { - /** Signature for structure. Must be 'R', 'A', 'W', '\0'. Actually a trick + /** Signature for structure. Must be 'R', 'A', 'W', '\\0'. Actually a trick * to make logging of the comment string produce sensible results. */ char szSignature[4]; @@ -142,5 +142,5 @@ bool fRawDisk; /** Filename for the raw disk. Ignored for partitioned raw disks. - * For Linux e.g. /dev/sda, and for Windows e.g. \\.\PhysicalDisk0. */ + * For Linux e.g. /dev/sda, and for Windows e.g. \\\\.\\PhysicalDisk0. */ const char *pszRawDisk; /** Number of entries in the partitions array. */ Index: /trunk/include/VBox/cdefs.h =================================================================== --- /trunk/include/VBox/cdefs.h (revision 25646) +++ /trunk/include/VBox/cdefs.h (revision 25647) @@ -60,4 +60,5 @@ #define VBOX_WITH_STATISTICS #define VBOX_STRICT +#define IN_DBG #define IN_DIS #define IN_INTNET_R0 @@ -67,4 +68,5 @@ #define IN_SUP_R3 #define IN_SUP_GC +#define IN_SUP_STATIC #define IN_USBLIB #define IN_VBOXDDU @@ -72,5 +74,5 @@ #define IN_VMM_R0 #define IN_VMM_R3 -/** @todo fixme */ +#define IN_VMM_STATIC #endif Index: /trunk/include/VBox/com/ErrorInfo.h =================================================================== --- /trunk/include/VBox/com/ErrorInfo.h (revision 25646) +++ /trunk/include/VBox/com/ErrorInfo.h (revision 25647) @@ -358,5 +358,5 @@ * otherwise. * - * @param aIsNull @true to prevent fetching error info and leave + * @param aIsNull @c true to prevent fetching error info and leave * the instance uninitialized. */ Index: /trunk/include/VBox/dbg.h =================================================================== --- /trunk/include/VBox/dbg.h (revision 25646) +++ /trunk/include/VBox/dbg.h (revision 25647) @@ -352,5 +352,4 @@ * @param pCmdHlp Pointer to the command callback structure. * @param rc The VBox status code. - * @param pcb Where to store the number of bytes written. * @param pszFormat Format string for additional messages. Can be NULL. * @param ... Format arguments, optional. Index: /trunk/include/VBox/dbgfsel.h =================================================================== --- /trunk/include/VBox/dbgfsel.h (revision 25646) +++ /trunk/include/VBox/dbgfsel.h (revision 25647) @@ -35,5 +35,5 @@ #include -/** @addgroup grp_dbgf +/** @addtogroup grp_dbgf * @{ */ @@ -87,5 +87,5 @@ -/** @def DBGFSELINFO_IS_EXPAND_DOWN +/** * Tests whether the selector info describes an expand-down selector or now. * Index: /trunk/include/VBox/pdmdrv.h =================================================================== --- /trunk/include/VBox/pdmdrv.h (revision 25646) +++ /trunk/include/VBox/pdmdrv.h (revision 25647) @@ -941,5 +941,5 @@ /** - * @copydoc PDMDRVHLP::pfnGetVirtualFreq + * @copydoc PDMDRVHLP::pfnTMGetVirtualFreq */ DECLINLINE(uint64_t) PDMDrvHlpTMGetVirtualFreq(PPDMDRVINS pDrvIns) Index: /trunk/include/VBox/pgm.h =================================================================== --- /trunk/include/VBox/pgm.h (revision 25646) +++ /trunk/include/VBox/pgm.h (revision 25647) @@ -465,5 +465,5 @@ VMMR3DECL(int) PGMR3PhysMMIO2MapKernel(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTR0PTR pR0Ptr); -/** @group PGMR3PhysRegisterRom flags. +/** @name PGMR3PhysRegisterRom flags. * @{ */ /** Inidicates that ROM shadowing should be enabled. */ Index: /trunk/include/iprt/assert.h =================================================================== --- /trunk/include/iprt/assert.h (revision 25646) +++ /trunk/include/iprt/assert.h (revision 25647) @@ -403,9 +403,13 @@ */ + /** @def RTASSERT_QUIET * This can be defined to shut up the messages for a file where this would be * problematic because the message printing code path passes thru it. * @internal */ -#ifdef RTASSERT_QUIET +#ifdef DOXYGEN_RUNNING +# define RTASSERT_QUIET +#endif +#if defined(RTASSERT_QUIET) && !defined(DOXYGEN_RUNNING) # define RTAssertMsg1Weak(pszExpr, uLine, pszfile, pszFunction) \ do { } while (0) Index: /trunk/src/VBox/Devices/PC/DevFwCommon.cpp =================================================================== --- /trunk/src/VBox/Devices/PC/DevFwCommon.cpp (revision 25646) +++ /trunk/src/VBox/Devices/PC/DevFwCommon.cpp (revision 25647) @@ -661,5 +661,5 @@ * * One or more APICs, such as the Intel 82489DX Advanced Programmable * Interrupt Controller or the integrated APIC, such as that on the - * Intel Pentium 735\90 and 815\100 processors, together with a discrete + * Intel Pentium 735\\90 and 815\\100 processors, together with a discrete * I/O APIC unit.'' * and later: Index: /trunk/src/VBox/Devices/PC/DevPcArch.c =================================================================== --- /trunk/src/VBox/Devices/PC/DevPcArch.c (revision 25646) +++ /trunk/src/VBox/Devices/PC/DevPcArch.c (revision 25647) @@ -145,26 +145,28 @@ * @remark Ralph Brown and friends have this to say about this port: * - * 0092 RW PS/2 system control port A (port B is at PORT 0061h) (see #P0415) - * - * Bitfields for PS/2 system control port A: - * Bit(s) Description (Table P0415) - * 7-6 any bit set to 1 turns activity light on - * 5 unused - * 4 watchdog timout occurred - * 3 =0 RTC/CMOS security lock (on password area) unlocked - * =1 CMOS locked (done by POST) - * 2 unused - * 1 A20 is active - * 0 =0 system reset or write - * =1 pulse alternate reset pin (high-speed alternate CPU reset) - * Notes: once set, bit 3 may only be cleared by a power-on reset - * on at least the C&T 82C235, bit 0 remains set through a CPU reset to - * allow the BIOS to determine the reset method - * on the PS/2 30-286 & "Tortuga" the INT 15h/87h memory copy does - * not use this port for A20 control, but instead uses the keyboard - * controller (8042). Reportedly this may cause the system to crash - * when access to the 8042 is disabled in password server mode - * (see #P0398). - * SeeAlso: #P0416,#P0417,MSR 00001000h + * @verbatim +0092 RW PS/2 system control port A (port B is at PORT 0061h) (see #P0415) + +Bitfields for PS/2 system control port A: +Bit(s) Description (Table P0415) + 7-6 any bit set to 1 turns activity light on + 5 unused + 4 watchdog timout occurred + 3 =0 RTC/CMOS security lock (on password area) unlocked + =1 CMOS locked (done by POST) + 2 unused + 1 A20 is active + 0 =0 system reset or write + =1 pulse alternate reset pin (high-speed alternate CPU reset) +Notes: once set, bit 3 may only be cleared by a power-on reset + on at least the C&T 82C235, bit 0 remains set through a CPU reset to + allow the BIOS to determine the reset method + on the PS/2 30-286 & "Tortuga" the INT 15h/87h memory copy does + not use this port for A20 control, but instead uses the keyboard + controller (8042). Reportedly this may cause the system to crash + when access to the 8042 is disabled in password server mode + (see #P0398). +SeeAlso: #P0416,#P0417,MSR 00001000h + * @endverbatim */ static DECLCALLBACK(int) pcarchIOPortPS2SysControlPortARead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb) Index: /trunk/src/VBox/Devices/Parallel/DevParallel.cpp =================================================================== --- /trunk/src/VBox/Devices/Parallel/DevParallel.cpp (revision 25646) +++ /trunk/src/VBox/Devices/Parallel/DevParallel.cpp (revision 25647) @@ -466,5 +466,5 @@ * @param pvUser User argument. * @param Port Port number used for the IN operation. - * @param u32 The value to output. + * @param pu32 Where to return the read value. * @param cb The value size in bytes. */ @@ -644,5 +644,5 @@ } -/** @copyfrom PIBASE::pfnqueryInterface */ +/** @copydoc PIBASE::pfnqueryInterface */ static DECLCALLBACK(void *) parallelQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface) { Index: /trunk/src/VBox/Devices/Serial/DevSerial.cpp =================================================================== --- /trunk/src/VBox/Devices/Serial/DevSerial.cpp (revision 25646) +++ /trunk/src/VBox/Devices/Serial/DevSerial.cpp (revision 25647) @@ -727,5 +727,5 @@ -/** @copyfrom PIBASE::pfnqueryInterface */ +/** @copydoc PIBASE::pfnqueryInterface */ static DECLCALLBACK(void *) serialQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface) { Index: /trunk/src/VBox/Main/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 25646) +++ /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 25647) @@ -3114,5 +3114,5 @@ * location already registered. * - * On return, sets @aConflict to the string describing the conflicting medium, + * On return, sets @a aConflict to the string describing the conflicting medium, * or sets it to @c Null if no conflicting media is found. Returns S_OK in * either case. A failure is unexpected. Index: /trunk/src/VBox/VMM/DBGFMem.cpp =================================================================== --- /trunk/src/VBox/VMM/DBGFMem.cpp (revision 25646) +++ /trunk/src/VBox/VMM/DBGFMem.cpp (revision 25647) @@ -44,5 +44,5 @@ * @param idCpu The ID of the CPU context to search in. * @param pAddress Where to store the mixed address. - * @param pu64Align The alignment restriction imposed on the search result. + * @param puAlign The alignment restriction imposed on the search result. * @param pcbRange The number of bytes to scan. Passed as a pointer because * it may be 64-bit. @@ -305,5 +305,5 @@ * @param pAddress Where to start writing. * @param pvBuf The data to write. - * @param cbRead The number of bytes to write. + * @param cbWrite The number of bytes to write. */ static DECLCALLBACK(int) dbgfR3MemWrite(PVM pVM, VMCPUID idCpu, PCDBGFADDRESS pAddress, void const *pvBuf, size_t cbWrite) Index: /trunk/src/VBox/VMM/PATM/CSAM.cpp =================================================================== --- /trunk/src/VBox/VMM/PATM/CSAM.cpp (revision 25646) +++ /trunk/src/VBox/VMM/PATM/CSAM.cpp (revision 25647) @@ -2064,5 +2064,5 @@ /** - * #PF Handler callback for virtual access handler ranges. + * \#PF Handler callback for virtual access handler ranges. * * Important to realize that a physical page in a range can have aliases, and @@ -2113,5 +2113,5 @@ /** - * #PF Handler callback for invalidation of virtual access handler ranges. + * \#PF Handler callback for invalidation of virtual access handler ranges. * * @param pVM VM Handle. Index: /trunk/src/VBox/VMM/PATM/PATM.cpp =================================================================== --- /trunk/src/VBox/VMM/PATM/PATM.cpp (revision 25646) +++ /trunk/src/VBox/VMM/PATM/PATM.cpp (revision 25647) @@ -806,5 +806,5 @@ /** - * #PF Handler callback for virtual access handler ranges. + * \#PF Handler callback for virtual access handler ranges. * * Important to realize that a physical page in a range can have aliases, and Index: /trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp =================================================================== --- /trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp (revision 25646) +++ /trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp (revision 25647) @@ -48,5 +48,6 @@ /** - * #PF Handler callback for virtual access handler ranges. (CSAM self-modifying code monitor) + * \#PF Handler callback for virtual access handler ranges. (CSAM self-modifying + * code monitor) * * Important to realize that a physical page in a range can have aliases, and Index: /trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp =================================================================== --- /trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp (revision 25646) +++ /trunk/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp (revision 25647) @@ -50,5 +50,5 @@ /** - * #PF Virtual Handler callback for Guest access a page monitored by PATM + * \#PF Virtual Handler callback for Guest access a page monitored by PATM * * @returns VBox status code (appropritate for trap handling and GC return). Index: /trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp =================================================================== --- /trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp (revision 25646) +++ /trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp (revision 25647) @@ -236,6 +236,7 @@ * same size was found and fReuseBuffer is true. * - * @notes This function may return fewer bytes than requested because entries - * may be marked as non evictable if they are used for I/O at the moment. + * @note This function may return fewer bytes than requested because entries + * may be marked as non evictable if they are used for I/O at the + * moment. */ static size_t pdmacFileCacheEvictPagesFrom(PPDMACFILECACHEGLOBAL pCache, size_t cbData, Index: /trunk/src/VBox/VMM/PGMInternal.h =================================================================== --- /trunk/src/VBox/VMM/PGMInternal.h (revision 25646) +++ /trunk/src/VBox/VMM/PGMInternal.h (revision 25647) @@ -3095,21 +3095,21 @@ STAMCOUNTER StatRZTrap0eHandlersUnhandled; /**< RC/R0: Number of traps due to access outside range of monitored page(s). */ STAMCOUNTER StatRZTrap0eHandlersInvalid; /**< RC/R0: Number of traps due to access to invalid physical memory. */ - STAMCOUNTER StatRZTrap0eUSNotPresentRead; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eUSNotPresentWrite; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eUSWrite; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eUSReserved; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eUSNXE; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eUSRead; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eSVNotPresentRead; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eSVNotPresentWrite; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eSVWrite; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eSVReserved; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eSNXE; /**< RC/R0: #PF err kind */ - STAMCOUNTER StatRZTrap0eGuestPF; /**< RC/R0: Real guest #PFs. */ - STAMCOUNTER StatRZTrap0eGuestPFUnh; /**< RC/R0: Real guest #PF ending up at the end of the #PF code. */ - STAMCOUNTER StatRZTrap0eGuestPFMapping; /**< RC/R0: Real guest #PF to HMA or other mapping. */ + STAMCOUNTER StatRZTrap0eUSNotPresentRead; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eUSNotPresentWrite; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eUSWrite; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eUSReserved; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eUSNXE; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eUSRead; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eSVNotPresentRead; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eSVNotPresentWrite; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eSVWrite; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eSVReserved; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eSNXE; /**< RC/R0: \#PF err kind */ + STAMCOUNTER StatRZTrap0eGuestPF; /**< RC/R0: Real guest \#PFs. */ + STAMCOUNTER StatRZTrap0eGuestPFUnh; /**< RC/R0: Real guest \#PF ending up at the end of the \#PF code. */ + STAMCOUNTER StatRZTrap0eGuestPFMapping; /**< RC/R0: Real guest \#PF to HMA or other mapping. */ STAMCOUNTER StatRZTrap0eWPEmulInRZ; /**< RC/R0: WP=0 virtualization trap, handled. */ STAMCOUNTER StatRZTrap0eWPEmulToR3; /**< RC/R0: WP=0 virtualization trap, chickened out. */ - STAMCOUNTER StatRZTrap0ePD[X86_PG_ENTRIES]; /**< RC/R0: PD distribution of the #PFs. */ + STAMCOUNTER StatRZTrap0ePD[X86_PG_ENTRIES]; /**< RC/R0: PD distribution of the \#PFs. */ STAMCOUNTER StatRZGuestCR3WriteHandled; /**< RC/R0: The number of times WriteHandlerCR3() was successfully called. */ STAMCOUNTER StatRZGuestCR3WriteUnhandled; /**< RC/R0: The number of times WriteHandlerCR3() was called and we had to fall back to the recompiler. */ @@ -3156,8 +3156,8 @@ STAMCOUNTER StatRZInvalidatePagePDOutOfSync; /**< RC/R0: The number of times PGMInvalidatePage() was called for an out of sync page directory. */ STAMCOUNTER StatRZInvalidatePageSkipped; /**< RC/R0: The number of times PGMInvalidatePage() was skipped due to not present shw or pending pending SyncCR3. */ - STAMCOUNTER StatRZPageOutOfSyncUser; /**< RC/R0: The number of times user page is out of sync was detected in #PF or VerifyAccessSyncPage. */ - STAMCOUNTER StatRZPageOutOfSyncSupervisor; /**< RC/R0: The number of times supervisor page is out of sync was detected in in #PF or VerifyAccessSyncPage. */ - STAMCOUNTER StatRZPageOutOfSyncUserWrite; /**< RC/R0: The number of times user page is out of sync was detected in #PF. */ - STAMCOUNTER StatRZPageOutOfSyncSupervisorWrite; /**< RC/R0: The number of times supervisor page is out of sync was detected in in #PF. */ + STAMCOUNTER StatRZPageOutOfSyncUser; /**< RC/R0: The number of times user page is out of sync was detected in \#PF or VerifyAccessSyncPage. */ + STAMCOUNTER StatRZPageOutOfSyncSupervisor; /**< RC/R0: The number of times supervisor page is out of sync was detected in in \#PF or VerifyAccessSyncPage. */ + STAMCOUNTER StatRZPageOutOfSyncUserWrite; /**< RC/R0: The number of times user page is out of sync was detected in \#PF. */ + STAMCOUNTER StatRZPageOutOfSyncSupervisorWrite; /**< RC/R0: The number of times supervisor page is out of sync was detected in in \#PF. */ STAMPROFILE StatRZPrefetch; /**< RC/R0: PGMPrefetchPage. */ STAMPROFILE StatRZFlushTLB; /**< RC/R0: Profiling of the PGMFlushTLB() body. */ @@ -3202,8 +3202,8 @@ STAMCOUNTER StatR3InvalidatePagePDOutOfSync; /**< R3: The number of times PGMInvalidatePage() was called for an out of sync page directory. */ STAMCOUNTER StatR3InvalidatePageSkipped; /**< R3: The number of times PGMInvalidatePage() was skipped due to not present shw or pending pending SyncCR3. */ - STAMCOUNTER StatR3PageOutOfSyncUser; /**< R3: The number of times user page is out of sync was detected in #PF or VerifyAccessSyncPage. */ - STAMCOUNTER StatR3PageOutOfSyncSupervisor; /**< R3: The number of times supervisor page is out of sync was detected in in #PF or VerifyAccessSyncPage. */ - STAMCOUNTER StatR3PageOutOfSyncUserWrite; /**< R3: The number of times user page is out of sync was detected in #PF. */ - STAMCOUNTER StatR3PageOutOfSyncSupervisorWrite; /**< R3: The number of times supervisor page is out of sync was detected in in #PF. */ + STAMCOUNTER StatR3PageOutOfSyncUser; /**< R3: The number of times user page is out of sync was detected in \#PF or VerifyAccessSyncPage. */ + STAMCOUNTER StatR3PageOutOfSyncSupervisor; /**< R3: The number of times supervisor page is out of sync was detected in in \#PF or VerifyAccessSyncPage. */ + STAMCOUNTER StatR3PageOutOfSyncUserWrite; /**< R3: The number of times user page is out of sync was detected in \#PF. */ + STAMCOUNTER StatR3PageOutOfSyncSupervisorWrite; /**< R3: The number of times supervisor page is out of sync was detected in in \#PF. */ STAMPROFILE StatR3Prefetch; /**< R3: PGMPrefetchPage. */ STAMPROFILE StatR3FlushTLB; /**< R3: Profiling of the PGMFlushTLB() body. */ Index: /trunk/src/VBox/VMM/STAM.cpp =================================================================== --- /trunk/src/VBox/VMM/STAM.cpp (revision 25646) +++ /trunk/src/VBox/VMM/STAM.cpp (revision 25647) @@ -984,5 +984,6 @@ * when this function is implemented. * The returned pointer must be freed by calling STAMR3SnapshotFree(). - * @param pcchSnapshot Where to store the size of the snapshot data. (Excluding the trailing '\0') + * @param pcchSnapshot Where to store the size of the snapshot data. + * (Excluding the trailing '\\0') */ VMMR3DECL(int) STAMR3Snapshot(PVM pVM, const char *pszPat, char **ppszSnapshot, size_t *pcchSnapshot, bool fWithDesc) Index: /trunk/src/VBox/VMM/TRPM.cpp =================================================================== --- /trunk/src/VBox/VMM/TRPM.cpp (revision 25646) +++ /trunk/src/VBox/VMM/TRPM.cpp (revision 25647) @@ -37,5 +37,5 @@ * processing all traps and interrupts. It will also monitor the guest IDT * because CSAM wishes to know about changes to it (trap/interrupt/syscall - * handler patching) and TRPM needs to keep the #\BP gate in sync (ring-3 + * handler patching) and TRPM needs to keep the \#BP gate in sync (ring-3 * considerations). See TRPMR3SyncIDT and CSAMR3CheckGates. * Index: /trunk/src/VBox/VMM/VMMAll/MMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/MMAll.cpp (revision 25646) +++ /trunk/src/VBox/VMM/VMMAll/MMAll.cpp (revision 25647) @@ -411,4 +411,5 @@ +#ifndef IN_RING3 /** * Converts a ring-3 host context address in the Hypervisor memory region to a current context address. @@ -420,5 +421,4 @@ * @thread The Emulation Thread. */ -#ifndef IN_RING3 VMMDECL(void *) MMHyperR3ToCC(PVM pVM, RTR3PTR R3Ptr) { @@ -469,5 +469,5 @@ } - +#ifndef IN_RC /** * Converts a raw-mode context address in the Hypervisor memory region to a current context address. @@ -479,5 +479,4 @@ * @thread The Emulation Thread. */ -#ifndef IN_RC VMMDECL(void *) MMHyperRCToCC(PVM pVM, RTRCPTR RCPtr) { @@ -490,6 +489,5 @@ #endif - - +#ifndef IN_RING3 /** * Converts a current context address in the Hypervisor memory region to a ring-3 host context address. @@ -501,5 +499,4 @@ * @thread The Emulation Thread. */ -#ifndef IN_RING3 VMMDECL(RTR3PTR) MMHyperCCToR3(PVM pVM, void *pv) { @@ -512,4 +509,5 @@ #endif +#ifndef IN_RING0 /** * Converts a current context address in the Hypervisor memory region to a ring-0 host context address. @@ -521,5 +519,4 @@ * @thread The Emulation Thread. */ -#ifndef IN_RING0 VMMDECL(RTR0PTR) MMHyperCCToR0(PVM pVM, void *pv) { @@ -533,4 +530,5 @@ +#ifndef IN_RC /** * Converts a current context address in the Hypervisor memory region to a raw-mode context address. @@ -542,5 +540,4 @@ * @thread The Emulation Thread. */ -#ifndef IN_RC VMMDECL(RTRCPTR) MMHyperCCToRC(PVM pVM, void *pv) { Index: /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (revision 25646) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (revision 25647) @@ -1171,5 +1171,5 @@ * @param GCPhys Start physical address earlier passed to PGMR3HandlerPhysicalRegister(). * @remarks Caller must take the PGM lock... - * @threads EMT. + * @thread EMT. */ VMMDECL(bool) PGMHandlerPhysicalIsRegistered(PVM pVM, RTGCPHYS GCPhys) @@ -1235,5 +1235,5 @@ * @param GCPtr Virtual address. * @remarks Will acquire the PGM lock. - * @threads Any. + * @thread Any. */ VMMDECL(bool) PGMHandlerVirtualIsRegistered(PVM pVM, RTGCPTR GCPtr) Index: /trunk/src/VBox/VMM/VMMGC/VMMGC.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMGC/VMMGC.cpp (revision 25646) +++ /trunk/src/VBox/VMM/VMMGC/VMMGC.cpp (revision 25647) @@ -330,5 +330,5 @@ /** - * Temporary #PF trap handler for the #PF test case. + * Temporary \#PF trap handler for the \#PF test case. * * @returns VBox status code (appropriate for GC return). @@ -349,5 +349,6 @@ /** - * Temporary #PF trap handler for the #PF test case, this one messes up the fs selector. + * Temporary \#PF trap handler for the \#PF test case, this one messes up the fs + * selector. * * @returns VBox status code (appropriate for GC return). Index: /trunk/src/VBox/VMM/VMMR0/HWVMXR0.h =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (revision 25646) +++ /trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (revision 25647) @@ -309,5 +309,5 @@ * Setup cached VMCS for performance reasons (Darwin) and for running 64 bits guests on 32 bits hosts. * - * @param pVCpu The VMCPU to operate on. + * @param pCache The cache. * @param idxField VMCS field */