diff options
| author | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
| commit | fd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch) | |
| tree | e6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/VMM/PGM.cpp | |
| parent | 8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff) | |
| parent | b35715c68a1bec309bc1990353e35c20a21d5c47 (diff) | |
| download | virtualbox-debian/3.0.10-dfsg-2bpo50+1.tar.gz | |
Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1
Conflicts:
debian/changelog
Diffstat (limited to 'src/VBox/VMM/PGM.cpp')
| -rw-r--r-- | src/VBox/VMM/PGM.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/VBox/VMM/PGM.cpp b/src/VBox/VMM/PGM.cpp index 2f44611ce..9d8701651 100644 --- a/src/VBox/VMM/PGM.cpp +++ b/src/VBox/VMM/PGM.cpp @@ -3779,6 +3779,9 @@ static PGMMODE pgmR3CalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE */ VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmGuestMode) { + bool fIsOldGuestPagingMode64Bits = (pVCpu->pgm.s.enmGuestMode >= PGMMODE_AMD64); + bool fIsNewGuestPagingMode64Bits = (enmGuestMode >= PGMMODE_AMD64); + Log(("PGMR3ChangeMode: Guest mode: %s -> %s\n", PGMGetModeName(pVCpu->pgm.s.enmGuestMode), PGMGetModeName(enmGuestMode))); STAM_REL_COUNTER_INC(&pVCpu->pgm.s.cGuestModeChanges); @@ -3803,8 +3806,16 @@ VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmGuestMode) /* * Exit old mode(s). */ +#if HC_ARCH_BITS == 32 + /* The nested shadow paging mode for AMD-V does change when running 64 bits guests on 32 bits hosts; typically PAE <-> AMD64 */ + const bool fForceShwEnterExit = ( fIsOldGuestPagingMode64Bits != fIsNewGuestPagingMode64Bits + && enmShadowMode == PGMMODE_NESTED); +#else + const bool fForceShwEnterExit = false; +#endif /* shadow */ - if (enmShadowMode != pVCpu->pgm.s.enmShadowMode) + if ( enmShadowMode != pVCpu->pgm.s.enmShadowMode + || fForceShwEnterExit) { LogFlow(("PGMR3ChangeMode: Shadow mode: %s -> %s\n", PGMGetModeName(pVCpu->pgm.s.enmShadowMode), PGMGetModeName(enmShadowMode))); if (PGM_SHW_PFN(Exit, pVCpu)) @@ -3840,28 +3851,29 @@ VMMR3DECL(int) PGMR3ChangeMode(PVM pVM, PVMCPU pVCpu, PGMMODE enmGuestMode) /* * Enter new shadow mode (if changed). */ - if (enmShadowMode != pVCpu->pgm.s.enmShadowMode) + if ( enmShadowMode != pVCpu->pgm.s.enmShadowMode + || fForceShwEnterExit) { int rc; pVCpu->pgm.s.enmShadowMode = enmShadowMode; switch (enmShadowMode) { case PGMMODE_32_BIT: - rc = PGM_SHW_NAME_32BIT(Enter)(pVCpu); + rc = PGM_SHW_NAME_32BIT(Enter)(pVCpu, false); break; case PGMMODE_PAE: case PGMMODE_PAE_NX: - rc = PGM_SHW_NAME_PAE(Enter)(pVCpu); + rc = PGM_SHW_NAME_PAE(Enter)(pVCpu, false); break; case PGMMODE_AMD64: case PGMMODE_AMD64_NX: - rc = PGM_SHW_NAME_AMD64(Enter)(pVCpu); + rc = PGM_SHW_NAME_AMD64(Enter)(pVCpu, fIsNewGuestPagingMode64Bits); break; case PGMMODE_NESTED: - rc = PGM_SHW_NAME_NESTED(Enter)(pVCpu); + rc = PGM_SHW_NAME_NESTED(Enter)(pVCpu, fIsNewGuestPagingMode64Bits); break; case PGMMODE_EPT: - rc = PGM_SHW_NAME_EPT(Enter)(pVCpu); + rc = PGM_SHW_NAME_EPT(Enter)(pVCpu, fIsNewGuestPagingMode64Bits); break; case PGMMODE_REAL: case PGMMODE_PROTECTED: |