Changeset 13873
- Timestamp:
- 11/05/08 16:05:58 (2 months ago)
- Files:
-
- trunk/include/VBox/hwaccm.h (modified) (1 diff)
- trunk/src/VBox/VMM/VMMInternal.h (modified) (2 diffs)
- trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (1 diff)
- trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (1 diff)
- trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/include/VBox/hwaccm.h
r13872 r13873 124 124 */ 125 125 VMMR0DECL(int) HWACCMR0SetupVM(PVM pVM); 126 VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM, RTCPUIDidVCpu);126 VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM, uintptr_t idVCpu); 127 127 VMMR0DECL(int) HWACCMR0Enter(PVM pVM, RTCPUID idVCpu); 128 128 VMMR0DECL(int) HWACCMR0Leave(PVM pVM, RTCPUID idVCpu); trunk/src/VBox/VMM/VMMInternal.h
r13872 r13873 450 450 * @param pVM The VM handle. 451 451 */ 452 typedef DECLCALLBACK(int) FNVMMR0SETJMP(PVM pVM, uint 32_t idCpu);452 typedef DECLCALLBACK(int) FNVMMR0SETJMP(PVM pVM, uintptr_t idCpu); 453 453 /** Pointer to FNVMMR0SETJMP(). */ 454 454 typedef FNVMMR0SETJMP *PFNVMMR0SETJMP; … … 466 466 * @param pVM The argument of that function. 467 467 */ 468 DECLASM(int) vmmR0CallHostSetJmp(PVMMR0JMPBUF pJmpBuf, PFNVMMR0SETJMP pfn, PVM pVM, uint 32_t idCpu);468 DECLASM(int) vmmR0CallHostSetJmp(PVMMR0JMPBUF pJmpBuf, PFNVMMR0SETJMP pfn, PVM pVM, uintptr_t idCpu); 469 469 470 470 /** trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp
r13872 r13873 965 965 * @param idVCpu VMCPUD id. 966 966 */ 967 VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM, RTCPUIDidVCpu)967 VMMR0DECL(int) HWACCMR0RunGuestCode(PVM pVM, uintptr_t idVCpu) 968 968 { 969 969 CPUMCTX *pCtx; trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp
r13872 r13873 527 527 * Loads the guest state 528 528 * 529 * NOTE: Don't do anything here that can cause a jump back to ring 3!!!!! 530 * 529 531 * @returns VBox status code. 530 532 * @param pVM The VM to operate on. trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
r13872 r13873 633 633 if (!HWACCMR0SuspendPending()) 634 634 { 635 rc = HWACCMR0Enter(pVM, idC PU);635 rc = HWACCMR0Enter(pVM, idCpu); 636 636 if (RT_SUCCESS(rc)) 637 637 { 638 rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, idC PU); /* this may resume code. */639 int rc2 = HWACCMR0Leave(pVM, idC PU);638 rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, idCpu); /* this may resume code. */ 639 int rc2 = HWACCMR0Leave(pVM, idCpu); 640 640 AssertRC(rc2); 641 641 }
