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/PGMPool.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/PGMPool.cpp')
-rw-r--r-- | src/VBox/VMM/PGMPool.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/VBox/VMM/PGMPool.cpp b/src/VBox/VMM/PGMPool.cpp index 9371c92f6..22de2a627 100644 --- a/src/VBox/VMM/PGMPool.cpp +++ b/src/VBox/VMM/PGMPool.cpp @@ -438,18 +438,6 @@ VMMR3DECL(int) PGMR3PoolGrow(PVM pVM) return i ? VINF_SUCCESS : VERR_NO_PAGE_MEMORY; } pPage->Core.Key = MMPage2Phys(pVM, pPage->pvPageR3); - if (pPage->Core.Key == 0) - { - /* Physical page 0 can trigger problems with AMD-V; allocate a new one. */ - pPage->pvPageR3 = MMR3PageAllocLow(pVM); - if (!pPage->pvPageR3) - { - Log(("We're out of memory!! i=%d\n", i)); - pgmUnlock(pVM); - return i ? VINF_SUCCESS : VERR_NO_PAGE_MEMORY; - } - pPage->Core.Key = MMPage2Phys(pVM, pPage->pvPageR3); - } pPage->GCPhys = NIL_RTGCPHYS; pPage->enmKind = PGMPOOLKIND_FREE; pPage->idx = pPage - &pPool->aPages[0]; |