← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - 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
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/PATM/PATM.cpp
176
176
     * Register save and load state notificators.
177
177
     */
178
178
    rc = SSMR3RegisterInternal(pVM, "PATM", 0, PATM_SSM_VERSION, sizeof(pVM->patm.s) + PATCH_MEMORY_SIZE  + PAGE_SIZE + PATM_STACK_TOTAL_SIZE + PAGE_SIZE,
179
 
                               NULL, patmr3Save, NULL,
180
 
                               NULL, patmr3Load, NULL);
181
 
    if (RT_FAILURE(rc))
182
 
    {
183
 
        AssertRC(rc);
184
 
        return rc;
185
 
    }
 
179
                               NULL, NULL, NULL,
 
180
                               NULL, patmR3Save, NULL,
 
181
                               NULL, patmR3Load, NULL);
 
182
    AssertRCReturn(rc, rc);
186
183
 
187
184
#ifdef VBOX_WITH_DEBUGGER
188
185
    /*
6007
6004
    PRECPATCHTOGUEST pPatchToGuestRec = 0;
6008
6005
    PVMCPU           pVCpu = VMMGetCpu0(pVM);
6009
6006
 
6010
 
    Assert(pVM->cCPUs == 1);
 
6007
    Assert(pVM->cCpus == 1);
6011
6008
 
6012
6009
    pNewEip   = 0;
6013
6010
    *ppNewEip = 0;