← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR0/VMMR0.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/VMMR0/VMMR0.cpp
464
464
        case VINF_PGM_CHANGE_MODE:
465
465
            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPGMChangeMode);
466
466
            break;
 
467
        case VINF_PGM_POOL_FLUSH_PENDING:
 
468
            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPGMFlushPending);
 
469
            break;
467
470
        case VINF_EM_PENDING_REQUEST:
468
471
            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPendingRequest);
469
472
            break;
1263
1266
    {
1264
1267
        PVMCPU pVCpu = VMMGetCpu(pVM);
1265
1268
 
 
1269
        if (pVCpu)
 
1270
        {
1266
1271
#ifdef RT_ARCH_X86
1267
 
        if (    pVCpu->vmm.s.CallRing3JmpBufR0.eip
1268
 
            &&  !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call)
 
1272
            if (    pVCpu->vmm.s.CallRing3JmpBufR0.eip
 
1273
                &&  !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call)
1269
1274
#else
1270
 
        if (    pVCpu->vmm.s.CallRing3JmpBufR0.rip
1271
 
            &&  !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call)
 
1275
            if (    pVCpu->vmm.s.CallRing3JmpBufR0.rip
 
1276
                &&  !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call)
1272
1277
#endif
1273
 
        {
1274
 
            int rc = VMMRZCallRing3(pVM, pVCpu, VMMCALLRING3_VM_R0_ASSERTION, 0);
1275
 
            return RT_FAILURE_NP(rc);
 
1278
            {
 
1279
                int rc = VMMRZCallRing3(pVM, pVCpu, VMMCALLRING3_VM_R0_ASSERTION, 0);
 
1280
                return RT_FAILURE_NP(rc);
 
1281
            }
1276
1282
        }
1277
1283
    }
1278
1284
#ifdef RT_OS_LINUX