Changeset 58116 in vbox for trunk/src/VBox/VMM/VMMR3
- Timestamp:
- Oct 8, 2015 2:51:53 PM (9 years ago)
- Location:
- trunk/src/VBox/VMM/VMMR3
- Files:
-
- 19 edited
-
CPUMDbg.cpp (modified) (27 diffs)
-
CSAM.cpp (modified) (2 diffs)
-
DBGFR3PlugIn.cpp (modified) (1 diff)
-
GIM.cpp (modified) (2 diffs)
-
MMHeap.cpp (modified) (1 diff)
-
MMPagePool.cpp (modified) (1 diff)
-
MMUkHeap.cpp (modified) (1 diff)
-
PATMR3Dbg.cpp (modified) (3 diffs)
-
PDMCritSect.cpp (modified) (9 diffs)
-
PDMDevHlp.cpp (modified) (5 diffs)
-
PDMDevMiscHlp.cpp (modified) (3 diffs)
-
PDMDriver.cpp (modified) (41 diffs)
-
PDMLdr.cpp (modified) (1 diff)
-
PDMUsb.cpp (modified) (1 diff)
-
PGM.cpp (modified) (10 diffs)
-
PGMPool.cpp (modified) (1 diff)
-
SSM.cpp (modified) (3 diffs)
-
TM.cpp (modified) (3 diffs)
-
VM.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp
r57358 r58116 35 35 36 36 /** 37 * @interface_method_impl{DBGFREGDESC, 37 * @interface_method_impl{DBGFREGDESC,pfnGet} 38 38 */ 39 39 static DECLCALLBACK(int) cpumR3RegGet_Generic(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 58 58 59 59 /** 60 * @interface_method_impl{DBGFREGDESC, 60 * @interface_method_impl{DBGFREGDESC,pfnSet} 61 61 */ 62 62 static DECLCALLBACK(int) cpumR3RegSet_Generic(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 104 104 105 105 /** 106 * @interface_method_impl{DBGFREGDESC, 106 * @interface_method_impl{DBGFREGDESC,pfnGet} 107 107 */ 108 108 static DECLCALLBACK(int) cpumR3RegGet_XStateGeneric(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 127 127 128 128 /** 129 * @interface_method_impl{DBGFREGDESC, 129 * @interface_method_impl{DBGFREGDESC,pfnSet} 130 130 */ 131 131 static DECLCALLBACK(int) cpumR3RegSet_XStateGeneric(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 174 174 175 175 /** 176 * @interface_method_impl{DBGFREGDESC, 176 * @interface_method_impl{DBGFREGDESC,pfnGet} 177 177 */ 178 178 static DECLCALLBACK(int) cpumR3RegSet_seg(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 185 185 186 186 /** 187 * @interface_method_impl{DBGFREGDESC, 187 * @interface_method_impl{DBGFREGDESC,pfnGet} 188 188 */ 189 189 static DECLCALLBACK(int) cpumR3RegGet_gdtr(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 202 202 203 203 /** 204 * @interface_method_impl{DBGFREGDESC, 204 * @interface_method_impl{DBGFREGDESC,pfnGet} 205 205 */ 206 206 static DECLCALLBACK(int) cpumR3RegSet_gdtr(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 212 212 213 213 /** 214 * @interface_method_impl{DBGFREGDESC, 214 * @interface_method_impl{DBGFREGDESC,pfnGet} 215 215 */ 216 216 static DECLCALLBACK(int) cpumR3RegGet_idtr(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 229 229 230 230 /** 231 * @interface_method_impl{DBGFREGDESC, 231 * @interface_method_impl{DBGFREGDESC,pfnGet} 232 232 */ 233 233 static DECLCALLBACK(int) cpumR3RegSet_idtr(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 273 273 274 274 /** 275 * @interface_method_impl{DBGFREGDESC, 275 * @interface_method_impl{DBGFREGDESC,pfnGet} 276 276 */ 277 277 static DECLCALLBACK(int) cpumR3RegGet_ftw(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 296 296 297 297 /** 298 * @interface_method_impl{DBGFREGDESC, 298 * @interface_method_impl{DBGFREGDESC,pfnGet} 299 299 */ 300 300 static DECLCALLBACK(int) cpumR3RegSet_ftw(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 306 306 307 307 /** 308 * @interface_method_impl{DBGFREGDESC, 308 * @interface_method_impl{DBGFREGDESC,pfnGet} 309 309 */ 310 310 static DECLCALLBACK(int) cpumR3RegGet_Dummy(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 333 333 334 334 /** 335 * @interface_method_impl{DBGFREGDESC, 335 * @interface_method_impl{DBGFREGDESC,pfnSet} 336 336 */ 337 337 static DECLCALLBACK(int) cpumR3RegSet_Dummy(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 350 350 351 351 /** 352 * @interface_method_impl{DBGFREGDESC, 352 * @interface_method_impl{DBGFREGDESC,pfnGet} 353 353 */ 354 354 static DECLCALLBACK(int) cpumR3RegGstGet_crX(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 372 372 373 373 /** 374 * @interface_method_impl{DBGFREGDESC, 374 * @interface_method_impl{DBGFREGDESC,pfnGet} 375 375 */ 376 376 static DECLCALLBACK(int) cpumR3RegGstSet_crX(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 430 430 431 431 /** 432 * @interface_method_impl{DBGFREGDESC, 432 * @interface_method_impl{DBGFREGDESC,pfnGet} 433 433 */ 434 434 static DECLCALLBACK(int) cpumR3RegGstGet_drX(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 452 452 453 453 /** 454 * @interface_method_impl{DBGFREGDESC, 454 * @interface_method_impl{DBGFREGDESC,pfnGet} 455 455 */ 456 456 static DECLCALLBACK(int) cpumR3RegGstSet_drX(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 500 500 501 501 /** 502 * @interface_method_impl{DBGFREGDESC, 502 * @interface_method_impl{DBGFREGDESC,pfnGet} 503 503 */ 504 504 static DECLCALLBACK(int) cpumR3RegGstGet_msr(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 529 529 530 530 /** 531 * @interface_method_impl{DBGFREGDESC, 531 * @interface_method_impl{DBGFREGDESC,pfnGet} 532 532 */ 533 533 static DECLCALLBACK(int) cpumR3RegGstSet_msr(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 588 588 589 589 /** 590 * @interface_method_impl{DBGFREGDESC, 590 * @interface_method_impl{DBGFREGDESC,pfnGet} 591 591 */ 592 592 static DECLCALLBACK(int) cpumR3RegGstGet_stN(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 607 607 608 608 /** 609 * @interface_method_impl{DBGFREGDESC, 609 * @interface_method_impl{DBGFREGDESC,pfnGet} 610 610 */ 611 611 static DECLCALLBACK(int) cpumR3RegGstSet_stN(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 624 624 625 625 /** 626 * @interface_method_impl{DBGFREGDESC, 626 * @interface_method_impl{DBGFREGDESC,pfnGet} 627 627 */ 628 628 static DECLCALLBACK(int) cpumR3RegHyperGet_crX(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 654 654 655 655 /** 656 * @interface_method_impl{DBGFREGDESC, 656 * @interface_method_impl{DBGFREGDESC,pfnGet} 657 657 */ 658 658 static DECLCALLBACK(int) cpumR3RegHyperSet_crX(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 665 665 666 666 /** 667 * @interface_method_impl{DBGFREGDESC, 667 * @interface_method_impl{DBGFREGDESC,pfnGet} 668 668 */ 669 669 static DECLCALLBACK(int) cpumR3RegHyperGet_drX(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 696 696 697 697 /** 698 * @interface_method_impl{DBGFREGDESC, 698 * @interface_method_impl{DBGFREGDESC,pfnGet} 699 699 */ 700 700 static DECLCALLBACK(int) cpumR3RegHyperSet_drX(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) … … 707 707 708 708 /** 709 * @interface_method_impl{DBGFREGDESC, 709 * @interface_method_impl{DBGFREGDESC,pfnGet} 710 710 */ 711 711 static DECLCALLBACK(int) cpumR3RegHyperGet_msr(void *pvUser, PCDBGFREGDESC pDesc, PDBGFREGVAL pValue) … … 728 728 729 729 /** 730 * @interface_method_impl{DBGFREGDESC, 730 * @interface_method_impl{DBGFREGDESC,pfnGet} 731 731 */ 732 732 static DECLCALLBACK(int) cpumR3RegHyperSet_msr(void *pvUser, PCDBGFREGDESC pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask) -
trunk/src/VBox/VMM/VMMR3/CSAM.cpp
r57389 r58116 1467 1467 * @param pfnCSAMR3Analyse Callback for testing the disassembled instruction 1468 1468 * @param pUserData User pointer (callback specific) 1469 * 1469 * @param pCacheRec GC to HC cache record. 1470 1470 */ 1471 1471 static int csamAnalyseCodeStream(PVM pVM, RCPTRTYPE(uint8_t *) pInstrGC, RCPTRTYPE(uint8_t *) pCurInstrGC, bool fCode32, … … 2351 2351 * calling EMT. 2352 2352 * @param GCPtr The virtual address the guest has changed. 2353 * @param pvUser Ignored. 2353 2354 * 2354 2355 * @remarks Not currently called by PGM. It was actually only called for a month -
trunk/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp
r57358 r58116 596 596 597 597 /** 598 * @ interface_method_impl{FNDBGFHANDLERINT, The 'plugins' info item.}598 * @callback_method_impl{FNDBGFHANDLERINT, The 'plugins' info item.} 599 599 */ 600 600 static DECLCALLBACK(void) dbgfR3PlugInInfoList(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs) -
trunk/src/VBox/VMM/VMMR3/GIM.cpp
r57989 r58116 529 529 * 530 530 * @todo In the future we might want to let the GIM provider decide what the 531 * handler should do (like throwing #GP faults).531 * handler should do (like throwing \#GP faults). 532 532 */ 533 533 static DECLCALLBACK(VBOXSTRICTRC) … … 539 539 */ 540 540 Assert(enmAccessType == PGMACCESSTYPE_WRITE); 541 return VINF_SUCCESS; /** @todo Hyper-V says we should #GP(0) fault for writes to the Hypercall and TSC page. */ 542 } 543 544 545 /** 546 * Maps a registered MMIO2 region in the guest address space. The region will be 547 * made read-only and writes from the guest will be ignored. 541 return VINF_SUCCESS; /** @todo Hyper-V says we should \#GP(0) fault for writes to the Hypercall and TSC page. */ 542 } 543 544 545 /** 546 * Maps a registered MMIO2 region in the guest address space. 547 * 548 * The region will be made read-only and writes from the guest will be ignored. 548 549 * 549 550 * @returns VBox status code. -
trunk/src/VBox/VMM/VMMR3/MMHeap.cpp
r57358 r58116 47 47 * 48 48 * @returns VBox status. 49 * @param p VM The handle to the VM the heap should be associated with.49 * @param pUVM Pointer to the user mode VM structure. 50 50 * @param ppHeap Where to store the heap pointer. 51 51 */ -
trunk/src/VBox/VMM/VMMR3/MMPagePool.cpp
r57358 r58116 63 63 * Allocate the pool structures. 64 64 */ 65 /** @todo @bu fref{1865},@bufref{3202}: mapping the page pool page into66 * ring-0.Need to change the ways we allocate it... */65 /** @todo @bugref{1865},@bugref{3202}: mapping the page pool page into ring-0. 66 * Need to change the ways we allocate it... */ 67 67 AssertReleaseReturn(sizeof(*pVM->mm.s.pPagePoolR3) + sizeof(*pVM->mm.s.pPagePoolLowR3) < PAGE_SIZE, VERR_INTERNAL_ERROR); 68 68 int rc = SUPR3PageAllocEx(1, 0 /*fFlags*/, (void **)&pVM->mm.s.pPagePoolR3, NULL /*pR0Ptr*/, NULL /*paPages*/); -
trunk/src/VBox/VMM/VMMR3/MMUkHeap.cpp
r57358 r58116 49 49 * 50 50 * @returns VBox status. 51 * @param p VM The handle to the VM the heap should be associated with.51 * @param pUVM Pointer to the user mode VM structure. 52 52 * @param ppHeap Where to store the heap pointer. 53 53 */ -
trunk/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp
r57358 r58116 295 295 ADD_MEMBER(hDbgMod, PATMGCSTATE, Restore.uFlags, "Restore.uFlags"); 296 296 297 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pGCStateGC, 0 /*fFlags /*/);297 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pGCStateGC, 0 /*fFlags*/); 298 298 AssertLogRelRC(rc); 299 299 RTDbgModRelease(hDbgMod); … … 309 309 ADD_FUNC(hDbgMod, pVM->patm.s.pStatsGC, pVM->patm.s.pStatsGC, PATM_STAT_MEMSIZE, "PATMMemStatsStart"); 310 310 311 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pStatsGC, 0 /*fFlags /*/);311 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pStatsGC, 0 /*fFlags*/); 312 312 AssertLogRelRC(rc); 313 313 RTDbgModRelease(hDbgMod); … … 323 323 patmR3DbgAddPatches(pVM, hDbgMod); 324 324 325 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pPatchMemGC, 0 /*fFlags /*/);325 rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pPatchMemGC, 0 /*fFlags*/); 326 326 AssertLogRelRC(rc); 327 327 } -
trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp
r57358 r58116 132 132 * @param pCritSect The critical section. 133 133 * @param pvKey The owner key. 134 * @param RT_SRC_POS_DECLThe source position.134 * @param SRC_POS The source position. 135 135 * @param pszName The name of the critical section (for statistics). 136 136 * @param pszNameFmt Format string for naming the critical section. For … … 219 219 * @param pCritSect The read/write critical section. 220 220 * @param pvKey The owner key. 221 * @param RT_SRC_POS_DECLThe source position.221 * @param SRC_POS The source position. 222 222 * @param pszName The name of the critical section (for statistics). 223 223 * @param pszNameFmt Format string for naming the critical section. For … … 325 325 * @param pDevIns Device instance. 326 326 * @param pCritSect Pointer to the critical section. 327 * @param RT_SRC_POS_DECLUse RT_SRC_POS.327 * @param SRC_POS Use RT_SRC_POS. 328 328 * @param pszNameFmt Format string for naming the critical section. For 329 329 * statistics and lock validation. … … 355 355 * @param pDevIns Device instance. 356 356 * @param pCritSect Pointer to the read/write critical section. 357 * @param RT_SRC_POS_DECLUse RT_SRC_POS.357 * @param SRC_POS Use RT_SRC_POS. 358 358 * @param pszNameFmt Format string for naming the critical section. For 359 359 * statistics and lock validation. … … 382 382 * @param pDevIns Device instance. 383 383 * @param pCritSect Pointer to the critical section. 384 * @param SRC_POS The source position. Optional. 384 385 * @param pszNameFmt Format string for naming the critical section. For 385 386 * statistics and lock validation. … … 400 401 * @param pDevIns Device instance. 401 402 * @param pCritSect Pointer to the read/write critical section. 403 * @param SRC_POS The source position. Optional. 402 404 * @param pszNameFmt Format string for naming the critical section. For 403 405 * statistics and lock validation. … … 417 419 * @param pVM Pointer to the VM. 418 420 * @param pDevIns Device instance. 421 * @param SRC_POS The source position. Optional. 419 422 * @param pCritSect Pointer to the critical section. 420 423 */ … … 439 442 * @param pDrvIns Driver instance. 440 443 * @param pCritSect Pointer to the critical section. 444 * @param SRC_POS The source position. Optional. 441 445 * @param pszNameFmt Format string for naming the critical section. For 442 446 * statistics and lock validation. … … 461 465 * @param pDrvIns Driver instance. 462 466 * @param pCritSect Pointer to the read/write critical section. 467 * @param SRC_POS The source position. Optional. 463 468 * @param pszNameFmt Format string for naming the critical section. For 464 469 * statistics and lock validation. -
trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
r57358 r58116 2136 2136 2137 2137 2138 /** @interface_method_impl{PDMDEVHLP ,pfnLdrGetRCInterfaceSymbols} */2138 /** @interface_method_impl{PDMDEVHLPR3,pfnLdrGetRCInterfaceSymbols} */ 2139 2139 static DECLCALLBACK(int) pdmR3DevHlp_LdrGetRCInterfaceSymbols(PPDMDEVINS pDevIns, void *pvInterface, size_t cbInterface, 2140 2140 const char *pszSymPrefix, const char *pszSymList) … … 2174 2174 2175 2175 2176 /** @interface_method_impl{PDMDEVHLP ,pfnLdrGetR0InterfaceSymbols} */2176 /** @interface_method_impl{PDMDEVHLPR3,pfnLdrGetR0InterfaceSymbols} */ 2177 2177 static DECLCALLBACK(int) pdmR3DevHlp_LdrGetR0InterfaceSymbols(PPDMDEVINS pDevIns, void *pvInterface, size_t cbInterface, 2178 2178 const char *pszSymPrefix, const char *pszSymList) … … 2212 2212 2213 2213 2214 /** @interface_method_impl{PDMDEVHLP ,pfnCallR0} */2214 /** @interface_method_impl{PDMDEVHLPR3,pfnCallR0} */ 2215 2215 static DECLCALLBACK(int) pdmR3DevHlp_CallR0(PPDMDEVINS pDevIns, uint32_t uOperation, uint64_t u64Arg) 2216 2216 { … … 2261 2261 2262 2262 2263 /** @interface_method_impl{PDMDEVHLP ,pfnVMGetSuspendReason} */2263 /** @interface_method_impl{PDMDEVHLPR3,pfnVMGetSuspendReason} */ 2264 2264 static DECLCALLBACK(VMSUSPENDREASON) pdmR3DevHlp_VMGetSuspendReason(PPDMDEVINS pDevIns) 2265 2265 { … … 2274 2274 2275 2275 2276 /** @interface_method_impl{PDMDEVHLP ,pfnVMGetResumeReason} */2276 /** @interface_method_impl{PDMDEVHLPR3,pfnVMGetResumeReason} */ 2277 2277 static DECLCALLBACK(VMRESUMEREASON) pdmR3DevHlp_VMGetResumeReason(PPDMDEVINS pDevIns) 2278 2278 { -
trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
r57358 r58116 312 312 } 313 313 314 314 315 /** @interface_method_impl{PDMAPICHLPR3,pfnSendInitIpi} */ 315 316 static DECLCALLBACK(void) pdmR3ApicHlp_SendInitIpi(PPDMDEVINS pDevIns, VMCPUID idCpu) … … 319 320 VMMR3SendInitIpi(pDevIns->Internal.s.pVMR3, idCpu); 320 321 } 322 321 323 322 324 /** @interface_method_impl{PDMAPICHLPR3,pfnGetRCHelpers} */ … … 529 531 530 532 /** @interface_method_impl{PDMPCIHLPR3,pfnIoApicSendMsi} */ 531 static DECLCALLBACK(void) pdmR3PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GC Addr, uint32_t uValue, uint32_t uTagSrc)532 { 533 PDMDEV_ASSERT_DEVINS(pDevIns); 534 Log4(("pdmR3PciHlp_IoApicSendMsi: address=%p value=%x uTagSrc=%#x\n", GC Addr, uValue, uTagSrc));535 PDMIoApicSendMsi(pDevIns->Internal.s.pVMR3, GC Addr, uValue, uTagSrc);533 static DECLCALLBACK(void) pdmR3PciHlp_IoApicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, uint32_t uValue, uint32_t uTagSrc) 534 { 535 PDMDEV_ASSERT_DEVINS(pDevIns); 536 Log4(("pdmR3PciHlp_IoApicSendMsi: address=%p value=%x uTagSrc=%#x\n", GCPhys, uValue, uTagSrc)); 537 PDMIoApicSendMsi(pDevIns->Internal.s.pVMR3, GCPhys, uValue, uTagSrc); 536 538 } 537 539 -
trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp
r57684 r58116 985 985 */ 986 986 987 /** @interface_method_impl{PDMDRVHLP ,pfnAttach} */987 /** @interface_method_impl{PDMDRVHLPR3,pfnAttach} */ 988 988 static DECLCALLBACK(int) pdmR3DrvHlp_Attach(PPDMDRVINS pDrvIns, uint32_t fFlags, PPDMIBASE *ppBaseInterface) 989 989 { … … 1023 1023 1024 1024 1025 /** @interface_method_impl{PDMDRVHLP ,pfnDetach} */1025 /** @interface_method_impl{PDMDRVHLPR3,pfnDetach} */ 1026 1026 static DECLCALLBACK(int) pdmR3DrvHlp_Detach(PPDMDRVINS pDrvIns, uint32_t fFlags) 1027 1027 { … … 1049 1049 1050 1050 1051 /** @interface_method_impl{PDMDRVHLP ,pfnDetachSelf} */1051 /** @interface_method_impl{PDMDRVHLPR3,pfnDetachSelf} */ 1052 1052 static DECLCALLBACK(int) pdmR3DrvHlp_DetachSelf(PPDMDRVINS pDrvIns, uint32_t fFlags) 1053 1053 { … … 1064 1064 1065 1065 1066 /** @interface_method_impl{PDMDRVHLP ,pfnMountPrepare} */1066 /** @interface_method_impl{PDMDRVHLPR3,pfnMountPrepare} */ 1067 1067 static DECLCALLBACK(int) pdmR3DrvHlp_MountPrepare(PPDMDRVINS pDrvIns, const char *pszFilename, const char *pszCoreDriver) 1068 1068 { … … 1138 1138 1139 1139 1140 /** @interface_method_impl{PDMDRVHLP ,pfnAssertEMT} */1140 /** @interface_method_impl{PDMDRVHLPR3,pfnAssertEMT} */ 1141 1141 static DECLCALLBACK(bool) pdmR3DrvHlp_AssertEMT(PPDMDRVINS pDrvIns, const char *pszFile, unsigned iLine, const char *pszFunction) 1142 1142 { … … 1154 1154 1155 1155 1156 /** @interface_method_impl{PDMDRVHLP ,pfnAssertOther} */1156 /** @interface_method_impl{PDMDRVHLPR3,pfnAssertOther} */ 1157 1157 static DECLCALLBACK(bool) pdmR3DrvHlp_AssertOther(PPDMDRVINS pDrvIns, const char *pszFile, unsigned iLine, const char *pszFunction) 1158 1158 { … … 1170 1170 1171 1171 1172 /** @interface_method_impl{PDMDRVHLP ,pfnVMSetError} */1172 /** @interface_method_impl{PDMDRVHLPR3,pfnVMSetError} */ 1173 1173 static DECLCALLBACK(int) pdmR3DrvHlp_VMSetError(PPDMDRVINS pDrvIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...) 1174 1174 { … … 1182 1182 1183 1183 1184 /** @interface_method_impl{PDMDRVHLP ,pfnVMSetErrorV} */1184 /** @interface_method_impl{PDMDRVHLPR3,pfnVMSetErrorV} */ 1185 1185 static DECLCALLBACK(int) pdmR3DrvHlp_VMSetErrorV(PPDMDRVINS pDrvIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va) 1186 1186 { … … 1191 1191 1192 1192 1193 /** @interface_method_impl{PDMDRVHLP ,pfnVMSetRuntimeError} */1193 /** @interface_method_impl{PDMDRVHLPR3,pfnVMSetRuntimeError} */ 1194 1194 static DECLCALLBACK(int) pdmR3DrvHlp_VMSetRuntimeError(PPDMDRVINS pDrvIns, uint32_t fFlags, const char *pszErrorId, const char *pszFormat, ...) 1195 1195 { … … 1203 1203 1204 1204 1205 /** @interface_method_impl{PDMDRVHLP ,pfnVMSetRuntimeErrorV} */1205 /** @interface_method_impl{PDMDRVHLPR3,pfnVMSetRuntimeErrorV} */ 1206 1206 static DECLCALLBACK(int) pdmR3DrvHlp_VMSetRuntimeErrorV(PPDMDRVINS pDrvIns, uint32_t fFlags, const char *pszErrorId, const char *pszFormat, va_list va) 1207 1207 { … … 1212 1212 1213 1213 1214 /** @interface_method_impl{PDMD EVHLPR3,pfnVMState} */1214 /** @interface_method_impl{PDMDRVHLPR3,pfnVMState} */ 1215 1215 static DECLCALLBACK(VMSTATE) pdmR3DrvHlp_VMState(PPDMDRVINS pDrvIns) 1216 1216 { … … 1225 1225 1226 1226 1227 /** @interface_method_impl{PDMD EVHLPR3,pfnVMTeleportedAndNotFullyResumedYet} */1227 /** @interface_method_impl{PDMDRVHLPR3,pfnVMTeleportedAndNotFullyResumedYet} */ 1228 1228 static DECLCALLBACK(bool) pdmR3DrvHlp_VMTeleportedAndNotFullyResumedYet(PPDMDRVINS pDrvIns) 1229 1229 { … … 1238 1238 1239 1239 1240 /** @interface_method_impl{PDMD EVHLPR3,pfnGetSupDrvSession} */1240 /** @interface_method_impl{PDMDRVHLPR3,pfnGetSupDrvSession} */ 1241 1241 static DECLCALLBACK(PSUPDRVSESSION) pdmR3DrvHlp_GetSupDrvSession(PPDMDRVINS pDrvIns) 1242 1242 { … … 1250 1250 1251 1251 1252 /** @interface_method_impl{PDMDRVHLP ,pfnQueueCreate} */1252 /** @interface_method_impl{PDMDRVHLPR3,pfnQueueCreate} */ 1253 1253 static DECLCALLBACK(int) pdmR3DrvHlp_QueueCreate(PPDMDRVINS pDrvIns, uint32_t cbItem, uint32_t cItems, uint32_t cMilliesInterval, 1254 1254 PFNPDMQUEUEDRV pfnCallback, const char *pszName, PPDMQUEUE *ppQueue) … … 1273 1273 1274 1274 1275 /** @interface_method_impl{PDMDRVHLP ,pfnTMGetVirtualFreq} */1275 /** @interface_method_impl{PDMDRVHLPR3,pfnTMGetVirtualFreq} */ 1276 1276 static DECLCALLBACK(uint64_t) pdmR3DrvHlp_TMGetVirtualFreq(PPDMDRVINS pDrvIns) 1277 1277 { … … 1282 1282 1283 1283 1284 /** @interface_method_impl{PDMDRVHLP ,pfnTMGetVirtualTime} */1284 /** @interface_method_impl{PDMDRVHLPR3,pfnTMGetVirtualTime} */ 1285 1285 static DECLCALLBACK(uint64_t) pdmR3DrvHlp_TMGetVirtualTime(PPDMDRVINS pDrvIns) 1286 1286 { … … 1291 1291 1292 1292 1293 /** @interface_method_impl{PDMDRVHLP ,pfnTMTimerCreate} */1293 /** @interface_method_impl{PDMDRVHLPR3,pfnTMTimerCreate} */ 1294 1294 static DECLCALLBACK(int) pdmR3DrvHlp_TMTimerCreate(PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer) 1295 1295 { … … 1306 1306 1307 1307 1308 /** @interface_method_impl{PDMDRVHLP ,pfnSSMRegister} */1308 /** @interface_method_impl{PDMDRVHLPR3,pfnSSMRegister} */ 1309 1309 static DECLCALLBACK(int) pdmR3DrvHlp_SSMRegister(PPDMDRVINS pDrvIns, uint32_t uVersion, size_t cbGuess, 1310 1310 PFNSSMDRVLIVEPREP pfnLivePrep, PFNSSMDRVLIVEEXEC pfnLiveExec, PFNSSMDRVLIVEVOTE pfnLiveVote, … … 1331 1331 1332 1332 1333 /** @interface_method_impl{PDMDRVHLP ,pfnSSMDeregister} */1334 static DECLCALLBACK(int) pdmR3DrvHlp_SSMDeregister(PPDMDRVINS pDrvIns, const char *pszName, uint32_t u 32Instance)1333 /** @interface_method_impl{PDMDRVHLPR3,pfnSSMDeregister} */ 1334 static DECLCALLBACK(int) pdmR3DrvHlp_SSMDeregister(PPDMDRVINS pDrvIns, const char *pszName, uint32_t uInstance) 1335 1335 { 1336 1336 PDMDRV_ASSERT_DRVINS(pDrvIns); 1337 1337 VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3); 1338 LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: pszName=%p:{%s} u 32Instance=%#x\n",1339 pDrvIns->pReg->szName, pDrvIns->iInstance, pszName, pszName, u 32Instance));1340 1341 int rc = SSMR3DeregisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pszName, u 32Instance);1338 LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: pszName=%p:{%s} uInstance=%#x\n", 1339 pDrvIns->pReg->szName, pDrvIns->iInstance, pszName, pszName, uInstance)); 1340 1341 int rc = SSMR3DeregisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pszName, uInstance); 1342 1342 1343 1343 LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc)); … … 1346 1346 1347 1347 1348 /** @interface_method_impl{PDMD EVHLP,pfnDBGFInfoRegister} */1348 /** @interface_method_impl{PDMDRVHLPR3,pfnDBGFInfoRegister} */ 1349 1349 static DECLCALLBACK(int) pdmR3DrvHlp_DBGFInfoRegister(PPDMDRVINS pDrvIns, const char *pszName, const char *pszDesc, PFNDBGFHANDLERDRV pfnHandler) 1350 1350 { … … 1360 1360 1361 1361 1362 /** @interface_method_impl{PDMD EVHLP,pfnDBGFInfoDeregister} */1362 /** @interface_method_impl{PDMDRVHLPR3,pfnDBGFInfoDeregister} */ 1363 1363 static DECLCALLBACK(int) pdmR3DrvHlp_DBGFInfoDeregister(PPDMDRVINS pDrvIns, const char *pszName) 1364 1364 { … … 1375 1375 1376 1376 1377 /** @interface_method_impl{PDMDRVHLP ,pfnSTAMRegister} */1377 /** @interface_method_impl{PDMDRVHLPR3,pfnSTAMRegister} */ 1378 1378 static DECLCALLBACK(void) pdmR3DrvHlp_STAMRegister(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, const char *pszName, STAMUNIT enmUnit, const char *pszDesc) 1379 1379 { … … 1387 1387 1388 1388 1389 /** @interface_method_impl{PDMDRVHLP ,pfnSTAMRegisterF} */1389 /** @interface_method_impl{PDMDRVHLPR3,pfnSTAMRegisterF} */ 1390 1390 static DECLCALLBACK(void) pdmR3DrvHlp_STAMRegisterF(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, 1391 1391 STAMUNIT enmUnit, const char *pszDesc, const char *pszName, ...) … … 1402 1402 1403 1403 1404 /** @interface_method_impl{PDMDRVHLP ,pfnSTAMRegisterV} */1404 /** @interface_method_impl{PDMDRVHLPR3,pfnSTAMRegisterV} */ 1405 1405 static DECLCALLBACK(void) pdmR3DrvHlp_STAMRegisterV(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, 1406 1406 STAMUNIT enmUnit, const char *pszDesc, const char *pszName, va_list args) … … 1414 1414 1415 1415 1416 /** @interface_method_impl{PDMDRVHLP ,pfnSTAMDeregister} */1416 /** @interface_method_impl{PDMDRVHLPR3,pfnSTAMDeregister} */ 1417 1417 static DECLCALLBACK(int) pdmR3DrvHlp_STAMDeregister(PPDMDRVINS pDrvIns, void *pvSample) 1418 1418 { … … 1426 1426 1427 1427 1428 /** @interface_method_impl{PDMDRVHLP ,pfnSUPCallVMMR0Ex} */1428 /** @interface_method_impl{PDMDRVHLPR3,pfnSUPCallVMMR0Ex} */ 1429 1429 static DECLCALLBACK(int) pdmR3DrvHlp_SUPCallVMMR0Ex(PPDMDRVINS pDrvIns, unsigned uOperation, void *pvArg, unsigned cbArg) 1430 1430 { … … 1447 1447 1448 1448 1449 /** @interface_method_impl{PDMDRVHLP ,pfnUSBRegisterHub} */1449 /** @interface_method_impl{PDMDRVHLPR3,pfnUSBRegisterHub} */ 1450 1450 static DECLCALLBACK(int) pdmR3DrvHlp_USBRegisterHub(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp) 1451 1451 { … … 1466 1466 1467 1467 1468 /** @interface_method_impl{PDMDRVHLP ,pfnSetAsyncNotification} */1468 /** @interface_method_impl{PDMDRVHLPR3,pfnSetAsyncNotification} */ 1469 1469 static DECLCALLBACK(int) pdmR3DrvHlp_SetAsyncNotification(PPDMDRVINS pDrvIns, PFNPDMDRVASYNCNOTIFY pfnAsyncNotify) 1470 1470 { … … 1495 1495 1496 1496 1497 /** @interface_method_impl{PDMDRVHLP ,pfnAsyncNotificationCompleted} */1497 /** @interface_method_impl{PDMDRVHLPR3,pfnAsyncNotificationCompleted} */ 1498 1498 static DECLCALLBACK(void) pdmR3DrvHlp_AsyncNotificationCompleted(PPDMDRVINS pDrvIns) 1499 1499 { … … 1518 1518 1519 1519 1520 /** @interface_method_impl{PDMDRVHLP ,pfnThreadCreate} */1520 /** @interface_method_impl{PDMDRVHLPR3,pfnThreadCreate} */ 1521 1521 static DECLCALLBACK(int) pdmR3DrvHlp_ThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread, 1522 1522 PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName) … … 1535 1535 1536 1536 1537 /** @interface_method_impl{PDMDRVHLP ,pfnAsyncCompletionTemplateCreate} */1537 /** @interface_method_impl{PDMDRVHLPR3,pfnAsyncCompletionTemplateCreate} */ 1538 1538 static DECLCALLBACK(int) pdmR3DrvHlp_AsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate, 1539 1539 PFNPDMASYNCCOMPLETEDRV pfnCompleted, void *pvTemplateUser, … … 1553 1553 1554 1554 #ifdef VBOX_WITH_NETSHAPER 1555 /** @interface_method_impl{PDMDRVHLP ,pfnNetShaperAttach} */1555 /** @interface_method_impl{PDMDRVHLPR3,pfnNetShaperAttach} */ 1556 1556 static DECLCALLBACK(int) pdmR3DrvHlp_NetShaperAttach(PPDMDRVINS pDrvIns, const char *pszBwGroup, PPDMNSFILTER pFilter) 1557 1557 { … … 1568 1568 1569 1569 1570 /** @interface_method_impl{PDMDRVHLP ,pfnNetShaperDetach} */1570 /** @interface_method_impl{PDMDRVHLPR3,pfnNetShaperDetach} */ 1571 1571 static DECLCALLBACK(int) pdmR3DrvHlp_NetShaperDetach(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter) 1572 1572 { … … 1584 1584 1585 1585 1586 /** @interface_method_impl{PDMDRVHLP ,pfnLdrGetRCInterfaceSymbols} */1586 /** @interface_method_impl{PDMDRVHLPR3,pfnLdrGetRCInterfaceSymbols} */ 1587 1587 static DECLCALLBACK(int) pdmR3DrvHlp_LdrGetRCInterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface, 1588 1588 const char *pszSymPrefix, const char *pszSymList) … … 1622 1622 1623 1623 1624 /** @interface_method_impl{PDMDRVHLP ,pfnLdrGetR0InterfaceSymbols} */1624 /** @interface_method_impl{PDMDRVHLPR3,pfnLdrGetR0InterfaceSymbols} */ 1625 1625 static DECLCALLBACK(int) pdmR3DrvHlp_LdrGetR0InterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface, 1626 1626 const char *pszSymPrefix, const char *pszSymList) … … 1660 1660 1661 1661 1662 /** @interface_method_impl{PDMDRVHLP ,pfnCritSectInit} */1662 /** @interface_method_impl{PDMDRVHLPR3,pfnCritSectInit} */ 1663 1663 static DECLCALLBACK(int) pdmR3DrvHlp_CritSectInit(PPDMDRVINS pDrvIns, PPDMCRITSECT pCritSect, 1664 1664 RT_SRC_POS_DECL, const char *pszName) … … 1678 1678 1679 1679 1680 /** @interface_method_impl{PDMDRVHLP ,pfnCallR0} */1680 /** @interface_method_impl{PDMDRVHLPR3,pfnCallR0} */ 1681 1681 static DECLCALLBACK(int) pdmR3DrvHlp_CallR0(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg) 1682 1682 { … … 1730 1730 1731 1731 1732 /** @interface_method_impl{PDMDRVHLP ,pfnFTSetCheckpoint} */1732 /** @interface_method_impl{PDMDRVHLPR3,pfnFTSetCheckpoint} */ 1733 1733 static DECLCALLBACK(int) pdmR3DrvHlp_FTSetCheckpoint(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType) 1734 1734 { … … 1738 1738 1739 1739 1740 /** @interface_method_impl{PDMDRVHLP ,pfnBlkCacheRetain} */1740 /** @interface_method_impl{PDMDRVHLPR3,pfnBlkCacheRetain} */ 1741 1741 static DECLCALLBACK(int) pdmR3DrvHlp_BlkCacheRetain(PPDMDRVINS pDrvIns, PPPDMBLKCACHE ppBlkCache, 1742 1742 PFNPDMBLKCACHEXFERCOMPLETEDRV pfnXferComplete, … … 1752 1752 1753 1753 1754 /** @interface_method_impl{PDMDRVHLP ,pfnVMGetSuspendReason} */1754 /** @interface_method_impl{PDMDRVHLPR3,pfnVMGetSuspendReason} */ 1755 1755 static DECLCALLBACK(VMSUSPENDREASON) pdmR3DrvHlp_VMGetSuspendReason(PPDMDRVINS pDrvIns) 1756 1756 { … … 1765 1765 1766 1766 1767 /** @interface_method_impl{PDMDRVHLP ,pfnVMGetResumeReason} */1767 /** @interface_method_impl{PDMDRVHLPR3,pfnVMGetResumeReason} */ 1768 1768 static DECLCALLBACK(VMRESUMEREASON) pdmR3DrvHlp_VMGetResumeReason(PPDMDRVINS pDrvIns) 1769 1769 { -
trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp
r57377 r58116 1023 1023 * @returns NULL on failure. 1024 1024 * 1025 * @param pszFile File name (no path). 1025 * @param pszFile File name (no path). 1026 * @param fShared If true, search in the shared directory (/usr/lib on Unix), else 1027 * search in the private directory (/usr/lib/virtualbox on Unix). 1028 * Ignored if VBOX_PATH_SHARED_LIBS is not defined. 1026 1029 */ 1027 1030 char *pdmR3FileR3(const char *pszFile, bool fShared) -
trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp
r57358 r58116 1483 1483 */ 1484 1484 1485 /** @interface_method_impl{PDMUSBHLP R3,pfnDriverAttach} */1485 /** @interface_method_impl{PDMUSBHLP,pfnDriverAttach} */ 1486 1486 static DECLCALLBACK(int) pdmR3UsbHlp_DriverAttach(PPDMUSBINS pUsbIns, RTUINT iLun, PPDMIBASE pBaseInterface, 1487 1487 PPDMIBASE *ppBaseInterface, const char *pszDesc) -
trunk/src/VBox/VMM/VMMR3/PGM.cpp
r57446 r58116 156 156 * 157 157 * 158 * @subsection sec_pgm_handlers_ virt Virtual Access Handlers158 * @subsection sec_pgm_handlers_phys Physical Access Handlers 159 159 * 160 160 * Placeholder. … … 249 249 * 250 250 * 251 * @s ubsection subsec_pgmPhys_Definitions Definitions251 * @section sec_pgmPhys_Definitions Definitions 252 252 * 253 253 * Allocation chunk - A RTR0MemObjAllocPhysNC object and the tracking … … 257 257 * 258 258 * 259 * @s ubsection subsec_pgmPhys_AllocPage Allocating a page.259 * @section sec_pgmPhys_AllocPage Allocating a page. 260 260 * 261 261 * Initially we map *all* guest memory to the (per VM) zero page, which … … 286 286 * 287 287 * 288 * @s ubsection subsec_pgmPhys_FreePage Freeing a page288 * @section sec_pgmPhys_FreePage Freeing a page 289 289 * 290 290 * There are a few points where a page can be freed: … … 316 316 * 317 317 * 318 * @s ubsection subsec_pgmPhys_SharePage Sharing a page318 * @section sec_pgmPhys_SharePage Sharing a page 319 319 * 320 320 * The basic idea is that there there will be a idle priority kernel … … 337 337 * 338 338 * 339 * @s ubsection subsec_pgmPhys_Fragmentation Fragmentation Concerns and Counter Measures339 * @section sec_pgmPhys_Fragmentation Fragmentation Concerns and Counter Measures 340 340 * 341 341 * The pages are organized in allocation chunks in ring-0, this is a necessity … … 365 365 * 366 366 * 367 * @s ubsection subsec_pgmPhys_Tracking Tracking Structures And Their Cost367 * @section sec_pgmPhys_Tracking Tracking Structures And Their Cost 368 368 * 369 369 * There's a difficult balance between keeping the per-page tracking structures … … 375 375 * 376 376 * 377 * @subs ubsection subsubsec_pgmPhys_Tracking_Kernel Kernel Space377 * @subsection subsec_pgmPhys_Tracking_Kernel Kernel Space 378 378 * 379 379 * @see pg_GMM 380 380 * 381 * @subs ubsection subsubsec_pgmPhys_Tracking_PerVM Per-VM381 * @subsection subsec_pgmPhys_Tracking_PerVM Per-VM 382 382 * 383 383 * Fixed info is the physical address of the page (HCPhys) and the page id … … 471 471 * 472 472 * 473 * @s ubsection subsec_pgmPhys_Serializing Serializing Access473 * @section sec_pgmPhys_Serializing Serializing Access 474 474 * 475 475 * Initially, we'll try a simple scheme: … … 496 496 * 497 497 * 498 * @s ubsection subsec_pgmPhys_Request VM Request interface498 * @section sec_pgmPhys_Request VM Request interface 499 499 * 500 500 * When in ring-0 it will become necessary to send requests to a VM so it can -
trunk/src/VBox/VMM/VMMR3/PGMPool.cpp
r57358 r58116 70 70 * 71 71 * 72 * @section sec_pgm_pool_ implMonitoring72 * @section sec_pgm_pool_monitoring Monitoring 73 73 * 74 74 * We always monitor PAGE_SIZE chunks of memory. When we've got multiple shadow -
trunk/src/VBox/VMM/VMMR3/SSM.cpp
r57358 r58116 8978 8978 * @param pSSM The saved state handle. 8979 8979 * @param rc The status code of the error. Use RT_SRC_POS. 8980 * @param RT_SRC_POS_DECLThe source location.8980 * @param SRC_POS The source location. 8981 8981 * @param pszFormat The message format string. 8982 8982 * @param ... Variable argument list. … … 8998 8998 * @param pSSM The saved state handle. 8999 8999 * @param rc The status code of the error. 9000 * @param RT_SRC_POS_DECLThe error location, use RT_SRC_POS.9000 * @param SRC_POS The error location, use RT_SRC_POS. 9001 9001 * @param pszFormat The message format string. 9002 9002 * @param va Variable argument list. … … 9058 9058 * @returns VERR_SSM_LOAD_CONFIG_MISMATCH. 9059 9059 * @param pSSM The saved state handle. 9060 * @param RT_SRC_POS_DECLThe error location, use RT_SRC_POS.9060 * @param SRC_POS The error location, use RT_SRC_POS. 9061 9061 * @param pszFormat The message format string. 9062 9062 * @param va Variable argument list. -
trunk/src/VBox/VMM/VMMR3/TM.cpp
r57431 r58116 285 285 pVM->tm.s.pfnVirtualGetRawR3 = tmVirtualNanoTSRediscover; 286 286 pVM->tm.s.VirtualGetRawDataR3.pfnRediscover = tmVirtualNanoTSRediscover; 287 pVM->tm.s.VirtualGetRawDataR3.pfnBad = tmVirtualNanoTSBad Prev;287 pVM->tm.s.VirtualGetRawDataR3.pfnBad = tmVirtualNanoTSBad; 288 288 pVM->tm.s.VirtualGetRawDataR3.pfnBadCpuIndex = tmVirtualNanoTSBadCpuIndex; 289 289 pVM->tm.s.VirtualGetRawDataR3.pu64Prev = &pVM->tm.s.u64VirtualRawPrev; … … 1020 1020 if (!HMIsEnabled(pVM)) 1021 1021 { 1022 rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSBad Prev",&pVM->tm.s.VirtualGetRawDataRC.pfnBad);1022 rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSBad", &pVM->tm.s.VirtualGetRawDataRC.pfnBad); 1023 1023 AssertRCReturn(rc, rc); 1024 1024 rc = PDMR3LdrGetSymbolRC(pVM, NULL, "tmVirtualNanoTSBadCpuIndex", &pVM->tm.s.VirtualGetRawDataRC.pfnBadCpuIndex); … … 1029 1029 } 1030 1030 1031 rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad Prev",&pVM->tm.s.VirtualGetRawDataR0.pfnBad);1031 rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad", &pVM->tm.s.VirtualGetRawDataR0.pfnBad); 1032 1032 AssertRCReturn(rc, rc); 1033 1033 rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBadCpuIndex", &pVM->tm.s.VirtualGetRawDataR0.pfnBadCpuIndex); -
trunk/src/VBox/VMM/VMMR3/VM.cpp
r58090 r58116 3829 3829 * @param pUVM Pointer to the user mode VM structure. 3830 3830 * @param rc The VBox status code. 3831 * @param RT_SRC_POS_DECLThe source position of this error.3831 * @param SRC_POS The source position of this error. 3832 3832 * @param pszFormat Format string. 3833 3833 * @param ... The arguments. … … 3849 3849 * @param pUVM Pointer to the user mode VM structure. 3850 3850 * @param rc The VBox status code. 3851 * @param RT_SRC_POS_DECLThe source position of this error.3851 * @param SRC_POS The source position of this error. 3852 3852 * @param pszFormat Format string. 3853 3853 * @param pArgs Pointer to the format arguments. … … 3909 3909 * @param pUVM The user mode VM handle. 3910 3910 * @param rc VBox status code. 3911 * @param RT_SRC_POS_DECLUse RT_SRC_POS.3911 * @param SRC_POS Use RT_SRC_POS. 3912 3912 * @param pszFormat Error message format string. 3913 3913 * @param ... Error message arguments. … … 3933 3933 * @param pUVM The user mode VM handle. 3934 3934 * @param rc VBox status code. 3935 * @param RT_SRC_POS_DECLUse RT_SRC_POS.3935 * @param SRC_POS Use RT_SRC_POS. 3936 3936 * @param pszFormat Error message format string. 3937 3937 * @param va Error message arguments.
Note:
See TracChangeset
for help on using the changeset viewer.
