Changeset 41386 in vbox
- Timestamp:
- May 22, 2012 9:04:47 AM (12 years ago)
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 5 edited
-
VMMAll/PGMAll.cpp (modified) (9 diffs)
-
VMMAll/PGMAllPhys.cpp (modified) (17 diffs)
-
VMMAll/PGMAllPool.cpp (modified) (9 diffs)
-
VMMR3/PGMMap.cpp (modified) (19 diffs)
-
VMMR3/PGMPhys.cpp (modified) (25 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMAll/PGMAll.cpp
r40450 r41386 523 523 * @returns NULL if not 524 524 * 525 * @param pVM The virtual machine.525 * @param pVM The VM handle. 526 526 * @param GCPtr The guest context pointer. 527 527 */ … … 800 800 * 801 801 * @returns VBox status code (appropriate for trap handling and GC return). 802 * @param pVM VM handle.802 * @param pVM The VM handle. 803 803 * @param pVCpu VMCPU handle. 804 804 * @param pRegFrame Register frame. … … 2318 2318 * 2319 2319 * @returns bool locked/not locked 2320 * @param pVM The VM to operate on.2320 * @param pVM The VM handle. 2321 2321 */ 2322 2322 VMMDECL(bool) PGMHasDirtyPages(PVM pVM) … … 2330 2330 * 2331 2331 * @returns bool owner/not owner 2332 * @param pVM The VM to operate on.2332 * @param pVM The VM handle. 2333 2333 */ 2334 2334 VMMDECL(bool) PGMIsLockOwner(PVM pVM) … … 2342 2342 * 2343 2343 * @returns VBox status code. 2344 * @param pVM The VM to operate on.2344 * @param pVM The VM handle. 2345 2345 * @param fUseLargePages Use/not use large pages 2346 2346 */ … … 2358 2358 * 2359 2359 * @returns VBox status code 2360 * @param pVM The VM to operate on.2360 * @param pVM The VM handle. 2361 2361 */ 2362 2362 int pgmLock(PVM pVM) … … 2376 2376 * 2377 2377 * @returns VBox status code 2378 * @param pVM The VM to operate on.2378 * @param pVM The VM handle. 2379 2379 */ 2380 2380 void pgmUnlock(PVM pVM) … … 2592 2592 * 2593 2593 * @returns Number of conflicts. 2594 * @param pVM The VM Handle.2594 * @param pVM The VM handle. 2595 2595 */ 2596 2596 VMMDECL(unsigned) PGMAssertNoMappingConflicts(PVM pVM) … … 2636 2636 * 2637 2637 * @returns Number of conflicts. 2638 * @param pVM The VM Handle.2639 * @param pVCpu VMCPU handle.2638 * @param pVM The VM handle. 2639 * @param pVCpu The VMCPU handle. 2640 2640 * @param cr3 The current guest CR3 register value. 2641 2641 * @param cr4 The current guest CR4 register value. -
trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
r40280 r41386 57 57 * 58 58 * @returns VBox status code (appropriate for trap handling and GC return). 59 * @param pVM VM Handle.59 * @param pVM The VM handle. 60 60 * @param uErrorCode CPU Error code. 61 61 * @param pRegFrame Trap register frame. … … 76 76 * 77 77 * @returns VBox status code (appropriate for trap handling and GC return). 78 * @param pVM VM Handle.78 * @param pVM The VM handle. 79 79 * @param uErrorCode CPU Error code. 80 80 * @param pRegFrame Trap register frame. … … 547 547 * @todo Propagate VERR_EM_NO_MEMORY up the call tree. 548 548 * 549 * @param pVM The VM address.549 * @param pVM The VM handle. 550 550 * @param pPage The physical page tracking structure. This will 551 551 * be modified on success. … … 703 703 * @todo Propagate VERR_EM_NO_MEMORY up the call tree. 704 704 * 705 * @param pVM The VM address.705 * @param pVM The VM handle. 706 706 * @param GCPhys The address of the page. 707 707 * … … 792 792 * @retval VERR_PGM_INVALID_LARGE_PAGE_RANGE if it can't be reused 793 793 * 794 * @param pVM The VM address.794 * @param pVM The VM handle. 795 795 * @param GCPhys The address of the page. 796 796 * @param pLargePage Page structure of the base page … … 853 853 * @returns VBox strict status code. 854 854 * 855 * @param pVM The VM address.855 * @param pVM The VM handle. 856 856 * @param pPage The physical page tracking structure. 857 857 * … … 877 877 * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. 878 878 * 879 * @param pVM The VM address.879 * @param pVM The VM handle. 880 880 * @param pPage The physical page tracking structure. 881 881 * @param GCPhys The address of the page. … … 1000 1000 * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. 1001 1001 * 1002 * @param pVM The VM address.1002 * @param pVM The VM handle. 1003 1003 * @param pPage The physical page tracking structure. 1004 1004 * @param GCPhys The address of the page. … … 1126 1126 * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. 1127 1127 * 1128 * @param pVM The VM address.1128 * @param pVM The VM handle. 1129 1129 * @param pPage The physical page tracking structure. 1130 1130 * @param GCPhys The address of the page. … … 1161 1161 * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. 1162 1162 * 1163 * @param pVM The VM address.1163 * @param pVM The VM handle. 1164 1164 * @param pPage The physical page tracking structure. Must be in the 1165 1165 * allocated state. … … 1190 1190 * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. 1191 1191 * 1192 * @param pVM The VM address.1192 * @param pVM The VM handle. 1193 1193 * @param pPage The physical page tracking structure. 1194 1194 * @param GCPhys The address of the page. … … 2032 2032 * Cache PGMPhys memory access 2033 2033 * 2034 * @param pVM VM Handle.2034 * @param pVM The VM handle. 2035 2035 * @param pCache Cache structure pointer 2036 2036 * @param GCPhys GC physical address … … 2197 2197 * @retval VERR_PGM_PHYS_WR_HIT_HANDLER in R0 and GC, NEVER in R3. 2198 2198 * 2199 * @param pVM VM Handle.2199 * @param pVM The VM handle. 2200 2200 * @param GCPhys Physical address start reading from. 2201 2201 * @param pvBuf Where to put the read bits. … … 2731 2731 * @retval VERR_PGM_PHYS_WR_HIT_HANDLER in R0 and GC, NEVER in R3. 2732 2732 * 2733 * @param pVM VM Handle.2733 * @param pVM The VM handle. 2734 2734 * @param GCPhys Physical address to write to. 2735 2735 * @param pvBuf What to write. … … 2844 2844 * 2845 2845 * @returns VBox status. 2846 * @param pVM VM handle.2846 * @param pVM The VM handle. 2847 2847 * @param pvDst The destination address. 2848 2848 * @param GCPhysSrc The source address (GC physical address). … … 2916 2916 * 2917 2917 * @returns VBox status. 2918 * @param pVM VM handle.2918 * @param pVM The VM handle. 2919 2919 * @param GCPhysDst The GC physical address of the destination. 2920 2920 * @param pvSrc The source buffer. … … 3987 3987 * 3988 3988 * @returns The page type. 3989 * @param pVM VM Handle.3989 * @param pVM The VM handle. 3990 3990 * @param GCPhys Guest physical address 3991 3991 */ -
trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp
r40451 r41386 140 140 * 141 141 * @returns VBox status code suitable for scheduling. 142 * @param pVM VM Handle.142 * @param pVM The VM handle. 143 143 * @param pvDst Destination address 144 144 * @param pvSrc Source guest virtual address. … … 735 735 * @returns true if we consider the page as being reused for a different purpose. 736 736 * @returns false if we consider it to still be a paging page. 737 * @param pVM VM Handle.737 * @param pVM The VM handle. 738 738 * @param pVCpu VMCPU Handle. 739 739 * @param pRegFrame Trap register frame. … … 1028 1028 * 1029 1029 * @returns VBox status code (appropriate for GC return). 1030 * @param pVM VM Handle.1030 * @param pVM The VM handle. 1031 1031 * @param uErrorCode CPU Error code. 1032 1032 * @param pRegFrame Trap register frame. … … 1606 1606 * Flush a dirty page 1607 1607 * 1608 * @param pVM VM Handle.1608 * @param pVM The VM handle. 1609 1609 * @param pPool The pool. 1610 1610 * @param idxSlot Dirty array slot index … … 1704 1704 * Add a new dirty page 1705 1705 * 1706 * @param pVM VM Handle.1706 * @param pVM The VM handle. 1707 1707 * @param pPool The pool. 1708 1708 * @param pPage The page. … … 1780 1780 * 1781 1781 * @return dirty or not 1782 * @param pVM VM Handle.1782 * @param pVM The VM handle. 1783 1783 * @param GCPhys Guest physical address 1784 1784 */ … … 1810 1810 * Reset all dirty pages by reinstating page monitoring. 1811 1811 * 1812 * @param pVM VM Handle.1812 * @param pVM The VM handle. 1813 1813 */ 1814 1814 void pgmPoolResetDirtyPages(PVM pVM) … … 1848 1848 * Invalidate the PT entry for the specified page 1849 1849 * 1850 * @param pVM VM Handle.1850 * @param pVM The VM handle. 1851 1851 * @param GCPtrPage Guest page to invalidate 1852 1852 */ … … 1869 1869 * Reset all dirty pages by reinstating page monitoring. 1870 1870 * 1871 * @param pVM VM Handle.1871 * @param pVM The VM handle. 1872 1872 * @param GCPhysPT Physical address of the page table 1873 1873 */ -
trunk/src/VBox/VMM/VMMR3/PGMMap.cpp
r39402 r41386 47 47 * 48 48 * @returns VBox status code. 49 * @param pVM VM Handle.49 * @param pVM The VM handle. 50 50 * @param GCPtr Virtual Address. (Page table aligned!) 51 51 * @param cb Size of the range. Must be a 4MB aligned! … … 215 215 * 216 216 * @returns VBox status code. 217 * @param pVM VM Handle.217 * @param pVM The VM handle. 218 218 * @param GCPtr Virtual Address. (Page table aligned!) 219 219 * … … 289 289 * 290 290 * @returns true/false. 291 * @param pVM Pointer to the shared VM structure.291 * @param pVM The VM handle. 292 292 * @param iPD The first PDE in the range. 293 293 * @param cPTs The number of PDEs in the range. … … 313 313 * The mapping *must* be in the list. 314 314 * 315 * @param pVM Pointer to the shared VM structure.315 * @param pVM The VM handle. 316 316 * @param pMapping The mapping to unlink. 317 317 */ … … 345 345 * Links the mapping. 346 346 * 347 * @param pVM Pointer to the shared VM structure.347 * @param pVM The VM handle. 348 348 * @param pMapping The mapping to linked. 349 349 */ … … 392 392 * 393 393 * @returns VBox status code. 394 * @param pVM Pointer to the shared VM structure.394 * @param pVM The VM handle. 395 395 * @thread EMT(0) 396 396 */ … … 478 478 * 479 479 * @returns VBox status code. 480 * @param pVM The VM .480 * @param pVM The VM handle. 481 481 * @param pcb Where to store the size. 482 482 */ … … 498 498 * 499 499 * @returns VBox status code. 500 * @param pVM The VM .500 * @param pVM The VM handle. 501 501 * @param GCPtrBase The address of the reserved range of guest memory. 502 502 * @param cb The size of the range starting at GCPtrBase. … … 538 538 * 539 539 * @returns VBox status code. 540 * @param pVM The VM .540 * @param pVM The VM handle. 541 541 * @param GCPtrBase The address of the reserved range of guest memory. 542 542 * @param cb The size of the range starting at GCPtrBase. … … 680 680 * 681 681 * @returns VBox status code. 682 * @param pVM The VM .682 * @param pVM The VM handle. 683 683 */ 684 684 VMMR3DECL(int) PGMR3MappingsDisable(PVM pVM) … … 721 721 * 722 722 * @returns VBox status code. 723 * @param pVM The VM .723 * @param pVM The VM handle. 724 724 */ 725 725 VMMR3DECL(int) PGMR3MappingsUnfix(PVM pVM) … … 766 766 * 767 767 * @returns VBox status code. 768 * @param pVM The virtual machine.768 * @param pVM The VM handle. 769 769 * @param Addr Intermediate context address of the mapping. 770 770 * @param HCPhys Start of the range of physical pages. This must be entriely below 4GB! … … 831 831 * 832 832 * @returns VBox status code. 833 * @param pVM VM handle.834 * @param uAddress Address of the mapping.835 * @param cPages Number of pages.833 * @param pVM The VM handle. 834 * @param uAddress Address of the mapping. 835 * @param cPages Number of pages. 836 836 * @param pPTDefault Pointer to the default page table for this mapping. 837 837 * @param pPTPaeDefault Pointer to the default page table for this mapping. … … 839 839 static int pgmR3MapIntermediateCheckOne(PVM pVM, uintptr_t uAddress, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault) 840 840 { 841 AssertMsg((uAddress >> X86_PD_SHIFT) + cPages <= 1024, ("64-bit fixme \n"));841 AssertMsg((uAddress >> X86_PD_SHIFT) + cPages <= 1024, ("64-bit fixme uAddress=%RGv cPages=%u\n", uAddress, cPages)); 842 842 843 843 /* … … 913 913 * Sets up the intermediate page tables for a verified mapping. 914 914 * 915 * @param pVM VM handle.915 * @param pVM The VM handle. 916 916 * @param uAddress Address of the mapping. 917 917 * @param HCPhys The physical address of the page range. … … 1064 1064 * Relocates a mapping to a new address. 1065 1065 * 1066 * @param pVM VM handle.1066 * @param pVM The VM handle. 1067 1067 * @param pMapping The mapping to relocate. 1068 1068 * @param GCPtrOldMapping The address of the start of the old mapping. … … 1186 1186 * 1187 1187 * @returns VBox status code. 1188 * @param pVM VM Handle.1188 * @param pVM The VM handle. 1189 1189 * @param pMapping The mapping which conflicts. 1190 1190 * @param pPDSrc The page directory of the guest OS. … … 1263 1263 * 1264 1264 * @returns VBox status code. 1265 * @param pVM VM Handle.1265 * @param pVM The VM handle. 1266 1266 * @param pMapping The mapping which conflicts. 1267 1267 * @param GCPtrOldMapping The address of the start of the current mapping. … … 1355 1355 * 1356 1356 * @returns VBox status. 1357 * @param pVM VM handle.1357 * @param pVM The VM handle. 1358 1358 * @param pvDst The destination address (HC of course). 1359 1359 * @param GCPtrSrc The source address (GC virtual address). -
trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp
r40274 r41386 102 102 * @retval VINF_SUCCESS. 103 103 * 104 * @param pVM VM Handle.104 * @param pVM The VM handle. 105 105 * @param GCPhys Physical address to read from. 106 106 * @param pvBuf Where to read into. … … 231 231 * @retval VERR_EM_NO_MEMORY. 232 232 * 233 * @param pVM VM Handle.233 * @param pVM The VM handle. 234 234 * @param GCPhys Physical address to write to. 235 235 * @param pvBuf What to write. … … 735 735 * Called when anything was relocated. 736 736 * 737 * @param pVM Pointer to the shared VM structure.737 * @param pVM The VM handle. 738 738 */ 739 739 void pgmR3PhysRelinkRamRanges(PVM pVM) … … 785 785 * Links a new RAM range into the list. 786 786 * 787 * @param pVM Pointer to the shared VM structure.787 * @param pVM The VM handle. 788 788 * @param pNew Pointer to the new list entry. 789 789 * @param pPrev Pointer to the previous list entry. If NULL, insert as head. … … 824 824 * Unlink an existing RAM range from the list. 825 825 * 826 * @param pVM Pointer to the shared VM structure.826 * @param pVM The VM handle. 827 827 * @param pRam Pointer to the new list entry. 828 828 * @param pPrev Pointer to the previous list entry. If NULL, insert as head. … … 860 860 * Unlink an existing RAM range from the list. 861 861 * 862 * @param pVM Pointer to the shared VM structure.862 * @param pVM The VM handle. 863 863 * @param pRam Pointer to the new list entry. 864 864 */ … … 1618 1618 * 1619 1619 * @returns VBox status code. 1620 * @param pVM Pointer to the shared VM structure.1620 * @param pVM The VM handle. 1621 1621 * @param GCPhys The physical address of the RAM. 1622 1622 * @param cb The size of the RAM. … … 1755 1755 * @returns VBox status code. 1756 1756 * 1757 * @param pVM Pointer to the shared VM structure.1757 * @param pVM The VM handle. 1758 1758 */ 1759 1759 int pgmR3PhysRamPreAllocate(PVM pVM) … … 1822 1822 * 1823 1823 * @returns VBox status code. 1824 * @param pVM Pointer to the shared VM structure.1824 * @param pVM The VM handle. 1825 1825 */ 1826 1826 int pgmR3PhysRamReset(PVM pVM) … … 1984 1984 * 1985 1985 * @returns VBox status code. 1986 * @param pVM Pointer to the shared VM structure.1986 * @param pVM The VM handle. 1987 1987 */ 1988 1988 int pgmR3PhysRamTerm(PVM pVM) … … 2065 2065 * @returns VBox status code. 2066 2066 * 2067 * @param pVM Pointer to the shared VM structure.2067 * @param pVM The VM handle. 2068 2068 * @param GCPhys The start of the MMIO region. 2069 2069 * @param cb The size of the MMIO region. … … 2231 2231 * 2232 2232 * @returns VBox status code. 2233 * @param pVM Pointer to the shared VM structure.2233 * @param pVM The VM handle. 2234 2234 * @param GCPhys The start of the MMIO region. 2235 2235 * @param cb The size of the MMIO region. … … 2346 2346 * 2347 2347 * @returns Pointer to the MMIO2 range. 2348 * @param pVM Pointer to the shared VM structure.2348 * @param pVM The VM handle. 2349 2349 * @param pDevIns The device instance owning the region. 2350 2350 * @param iRegion The region. … … 2381 2381 * @retval VERR_ALREADY_EXISTS if the region already exists. 2382 2382 * 2383 * @param pVM Pointer to the shared VM structure.2383 * @param pVM The VM handle. 2384 2384 * @param pDevIns The device instance owning the region. 2385 2385 * @param iRegion The region number. If the MMIO2 memory is a PCI … … 2509 2509 * 2510 2510 * @returns VBox status code. 2511 * @param pVM Pointer to the shared VM structure.2511 * @param pVM The VM handle. 2512 2512 * @param pDevIns The device instance owning the region. 2513 2513 * @param iRegion The region. If it's UINT32_MAX it'll be a wildcard match. … … 2614 2614 * @returns VBox status code. 2615 2615 * 2616 * @param pVM Pointer to the shared VM structure.2617 * @param pDevIns The 2616 * @param pVM The VM handle. 2617 * @param pDevIns The device instance owning the region. 2618 2618 */ 2619 2619 VMMR3DECL(int) PGMR3PhysMMIO2Map(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys) … … 2870 2870 * 2871 2871 * @returns true/false accordingly. 2872 * @param pVM Pointer to the shared VM structure.2872 * @param pVM The VM handle. 2873 2873 * @param pDevIns The owner of the memory, optional. 2874 2874 * @param GCPhys The address to check. … … 2908 2908 * 2909 2909 * @returns VBox status code. 2910 * @param pVM Pointer to the shared VM structure.2910 * @param pVM The VM handle. 2911 2911 * @param pDevIns The owner of the memory, optional. 2912 2912 * @param iRegion The region. … … 2943 2943 * @return VBox status code. 2944 2944 * 2945 * @param pVM Pointer to the shared VM structure.2945 * @param pVM The VM handle. 2946 2946 * @param pDevIns The device owning the MMIO2 memory. 2947 2947 * @param iRegion The region. … … 2985 2985 * 2986 2986 * @returns VBox status. 2987 * @param pVM VM Handle.2987 * @param pVM The VM handle. 2988 2988 * @param pDevIns The device instance owning the ROM. 2989 2989 * @param GCPhys First physical address in the range. … … 3348 3348 * 3349 3349 * @returns VBox status. 3350 * @param pVM VM Handle.3350 * @param pVM The VM handle. 3351 3351 * @param pDevIns The device instance owning the ROM. 3352 3352 * @param GCPhys First physical address in the range. … … 3382 3382 * @returns VINF_SUCCESS if the handler have carried out the operation. 3383 3383 * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. 3384 * @param pVM VM Handle.3384 * @param pVM The VM handle. 3385 3385 * @param GCPhys The physical address the guest is writing to. 3386 3386 * @param pvPhys The HC mapping of that address. … … 3617 3617 * @retval VINF_PGM_SYNC_CR3 3618 3618 * 3619 * @param pVM Pointer to the shared VM structure.3619 * @param pVM The VM handle. 3620 3620 * @param GCPhys Where to start. Page aligned. 3621 3621 * @param cb How much to change. Page aligned. … … 3943 3943 * 3944 3944 * @returns VBox status code. 3945 * @param pVM The VM to operate on.3945 * @param pVM The VM handle. 3946 3946 */ 3947 3947 void pgmR3PhysUnmapChunk(PVM pVM) … … 4408 4408 * This is used by ballooning, remapping MMIO2, RAM reset and state loading. 4409 4409 * 4410 * @param pVM Pointer to the shared VM structure.4410 * @param pVM The VM handle. 4411 4411 * @param pReq Pointer to the request. 4412 4412 * @param pcPendingPages Where the number of pages waiting to be freed are
Note:
See TracChangeset
for help on using the changeset viewer.

