Changeset 8543
- Timestamp:
- 05/02/08 19:48:42 (8 months ago)
- Files:
-
- trunk/include/VBox/err.h (modified) (1 diff)
- trunk/src/VBox/VMM/PGMMap.cpp (modified) (5 diffs)
- trunk/src/VBox/VMM/VMM.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/VBox/err.h
r8155 r8543 396 396 /** Physical range crosses dynamic ram chunk boundary; translation to HC ptr not safe. */ 397 397 #define VERR_PGM_GCPHYS_RANGE_CROSSES_BOUNDARY (-1626) 398 /** Conflict between the core memory and the intermediate paging context, try again. 399 * There are some very special conditions applying to the intermediate paging context 400 * (used during the world switches), and some times we continuously run into these 401 * when asking the host kernel for memory during VM init. Let us know if you run into 402 * this and we'll adjust the code so it tries harder to avoid it. 403 */ 404 #define VERR_PGM_INTERMEDIATE_PAGING_CONFLICT (-1627) 405 398 406 /** @} */ 399 407 trunk/src/VBox/VMM/PGMMap.cpp
r8155 r8543 501 501 ) 502 502 ) 503 { 504 AssertMsgFailed(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages)); 505 LogRel(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages)); 506 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */ 507 } 503 AssertLogRelMsgFailedReturn(("Addr=%RTptr HCPhys=%VHp cbPages=%d\n", Addr, HCPhys, cbPages), 504 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 508 505 509 506 /* The intermediate mapping must not conflict with our default hypervisor address. */ … … 514 511 : pvHyperGC + cbHyper > uAddress 515 512 ) 516 { 517 AssertMsgFailed(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages)); 518 LogRel(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages)); 519 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */ 520 } 513 AssertLogRelMsgFailedReturn(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages), 514 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 521 515 522 516 const unsigned cPages = cbPages >> PAGE_SHIFT; … … 575 569 /** @todo this must be handled with a relocation of the conflicting mapping! 576 570 * Which of course cannot be done because we're in the middle of the initialization. bad design! */ 577 AssertMsgFailed(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress)); 578 LogRel(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress)); 579 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */ 571 AssertLogRelMsgFailedReturn(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress), 572 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 580 573 } 581 574 } 582 575 if (pPT->a[iPTE].u) 583 { 584 AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", iPTE, iPDE, uAddress, pPT->a[iPTE].u)); 585 LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", 586 iPTE, iPDE, uAddress, pPT->a[iPTE].u)); 587 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */ 588 } 576 AssertLogRelMsgFailedReturn(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPT->a[iPTE].u=%RX32\n", iPTE, iPDE, uAddress, pPT->a[iPTE].u), 577 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 589 578 590 579 /* … … 608 597 /** @todo this must be handled with a relocation of the conflicting mapping! 609 598 * Which of course cannot be done because we're in the middle of the initialization. bad design! */ 610 AssertMsgFailed(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress)); 611 LogRel(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress)); 612 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */ 599 AssertLogRelMsgFailedReturn(("Conflict between core code and PGMR3Mapping(). uAddress=%VHv\n", uAddress), 600 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 613 601 } 614 602 } 615 603 if (pPTPae->a[iPTE].u) 616 { 617 AssertMsgFailed(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", iPTE, iPDE, uAddress, pPTPae->a[iPTE].u)); 618 LogRel(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", 619 iPTE, iPDE, uAddress, pPTPae->a[iPTE].u)); 620 return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo error codes! */ 621 } 604 AssertLogRelMsgFailedReturn(("Conflict iPTE=%#x iPDE=%#x uAddress=%VHv pPTPae->a[iPTE].u=%#RX64\n", iPTE, iPDE, uAddress, pPTPae->a[iPTE].u), 605 VERR_PGM_INTERMEDIATE_PAGING_CONFLICT); 622 606 623 607 /* next */ … … 1201 1185 DECLCALLBACK(void) pgmR3MapInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs) 1202 1186 { 1203 pHlp->pfnPrintf(pHlp, pVM->pgm.s.fMappingsFixed 1204 ? "\nThe mappings are FIXED.\n" 1187 pHlp->pfnPrintf(pHlp, pVM->pgm.s.fMappingsFixed 1188 ? "\nThe mappings are FIXED.\n" 1205 1189 : "\nThe mappings are FLOATING.\n"); 1206 1190 PPGMMAPPING pCur; trunk/src/VBox/VMM/VMM.cpp
r8542 r8543 246 246 { 247 247 rc = PGMR3MapIntermediate(pVM, pVM->vmm.s.pvHCCoreCodeR0, pVM->vmm.s.HCPhysCoreCode, cbCoreCode); 248 if (rc == VERR_PGM_ MAPPINGS_FIX_CONFLICT)248 if (rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT) 249 249 { 250 250 /* try more allocations. */ … … 269 269 break; 270 270 rc = PGMR3MapIntermediate(pVM, pVM->vmm.s.pvHCCoreCodeR0, pVM->vmm.s.HCPhysCoreCode, cbCoreCode); 271 } while ( rc == VERR_PGM_ MAPPINGS_FIX_CONFLICT272 && i < ELEMENTS(aBadTries) - 1);271 } while ( rc == VERR_PGM_INTERMEDIATE_PAGING_CONFLICT 272 && i < RT_ELEMENTS(aBadTries) - 1); 273 273 274 274 /* cleanup */
