← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/VMM/PGMPool.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/PGMPool.cpp
679
679
                case PGMPOOLKIND_PAE_PT_FOR_PAE_2MB:
680
680
                case PGMPOOLKIND_32BIT_PT_FOR_PHYS:
681
681
                case PGMPOOLKIND_PAE_PT_FOR_PHYS:
 
682
                case PGMPOOLKIND_EPT_PT_FOR_PHYS:
682
683
                {
683
684
#ifdef PGMPOOL_WITH_USER_TRACKING
684
685
                    if (pPage->cPresent)
775
776
 
776
777
    /* Clear the PGM_SYNC_CLEAR_PGM_POOL flag on all VCPUs to prevent redundant flushes. */
777
778
    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
778
 
    {
779
 
        PVMCPU pVCpu = &pVM->aCpus[idCpu];
780
 
        pVCpu->pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
781
 
    }
 
779
        pVM->aCpus[idCpu].pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
 
780
 
 
781
    /* Flush job finished. */
 
782
    VM_FF_CLEAR(pVM, VM_FF_PGM_POOL_FLUSH_PENDING);
782
783
 
783
784
    pPool->cPresent = 0;
784
785
    pgmUnlock(pVM);