← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR3/PGM.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR3/PGM.cpp
1
 
/* $Id: PGM.cpp 37803 2011-07-06 14:45:27Z vboxsync $ */
 
1
/* $Id: PGM.cpp $ */
2
2
/** @file
3
3
 * PGM - Page Manager and Monitor. (Mixing stuff here, not good?)
4
4
 */
1243
1243
#endif
1244
1244
            pPGM->apGstPaePDsRC[i]             = NIL_RTRCPTR;
1245
1245
            pPGM->aGCPhysGstPaePDs[i]          = NIL_RTGCPHYS;
 
1246
            pPGM->aGstPaePdpeRegs[i].u         = UINT64_MAX;
1246
1247
            pPGM->aGCPhysGstPaePDsMonitored[i] = NIL_RTGCPHYS;
1247
1248
        }
1248
1249
 
1595
1596
                MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[0]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[1]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[2]), MMPage2Phys(pVM, pVM->pgm.s.apInterPaePDs[3]),
1596
1597
                MMPage2Phys(pVM, pVM->pgm.s.pInterPaePDPT64)));
1597
1598
#endif
 
1599
 
 
1600
        /*
 
1601
         * Log the host paging mode. It may come in handy.
 
1602
         */
 
1603
        const char *pszHostMode;
 
1604
        switch (pVM->pgm.s.enmHostMode)
 
1605
        {
 
1606
            case SUPPAGINGMODE_32_BIT:              pszHostMode = "32-bit"; break;
 
1607
            case SUPPAGINGMODE_32_BIT_GLOBAL:       pszHostMode = "32-bit+PGE"; break;
 
1608
            case SUPPAGINGMODE_PAE:                 pszHostMode = "PAE"; break;
 
1609
            case SUPPAGINGMODE_PAE_GLOBAL:          pszHostMode = "PAE+PGE"; break;
 
1610
            case SUPPAGINGMODE_PAE_NX:              pszHostMode = "PAE+NXE"; break;
 
1611
            case SUPPAGINGMODE_PAE_GLOBAL_NX:       pszHostMode = "PAE+PGE+NXE"; break;
 
1612
            case SUPPAGINGMODE_AMD64:               pszHostMode = "AMD64"; break;
 
1613
            case SUPPAGINGMODE_AMD64_GLOBAL:        pszHostMode = "AMD64+PGE"; break;
 
1614
            case SUPPAGINGMODE_AMD64_NX:            pszHostMode = "AMD64+NX"; break;
 
1615
            case SUPPAGINGMODE_AMD64_GLOBAL_NX:     pszHostMode = "AMD64+PGE+NX"; break;
 
1616
            default:                                pszHostMode = "???"; break;
 
1617
        }
 
1618
        LogRel(("Host paging mode: %s\n", pszHostMode));
 
1619
 
1598
1620
        return VINF_SUCCESS;
1599
1621
    }
1600
1622