← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* Merge from debian unstable (LP: #444812), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
* Try to remove existing dkms modules before adding the new modules
  (LP: #434503)
  - debian/virtualbox-ose-source.postinst
  - debian/virtualbox-ose-guest-source.postinst
* Don't fail if dkms modules have already been removed
  - debian/virtualbox-ose-source.prerm
  - debian/virtualbox-ose-guest-source.prerm

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/HWACCM.cpp
2520
2520
            rc = SSMR3GetU32(pSSM, (uint32_t *)&pPatch->enmType);
2521
2521
            AssertRCReturn(rc, rc);
2522
2522
 
 
2523
            if (pPatch->enmType == HWACCMTPRINSTR_JUMP_REPLACEMENT)
 
2524
                pVM->hwaccm.s.svm.fTPRPatchingActive = true;
 
2525
 
 
2526
            Assert(pPatch->enmType == HWACCMTPRINSTR_JUMP_REPLACEMENT || pVM->hwaccm.s.svm.fTPRPatchingActive == false);
 
2527
 
2523
2528
            rc = SSMR3GetU32(pSSM, &pPatch->uSrcOperand);
2524
2529
            AssertRCReturn(rc, rc);
2525
2530
 
2531
2536
 
2532
2537
            rc = SSMR3GetU32(pSSM, &pPatch->pJumpTarget);
2533
2538
            AssertRCReturn(rc, rc);
 
2539
 
 
2540
            Log(("hwaccmR3Load: patch %d\n", i));
 
2541
            Log(("Key       = %x\n", pPatch->Core.Key));
 
2542
            Log(("cbOp      = %d\n", pPatch->cbOp));
 
2543
            Log(("cbNewOp   = %d\n", pPatch->cbNewOp));
 
2544
            Log(("type      = %d\n", pPatch->enmType));
 
2545
            Log(("srcop     = %d\n", pPatch->uSrcOperand));
 
2546
            Log(("dstop     = %d\n", pPatch->uDstOperand));
 
2547
            Log(("cFaults   = %d\n", pPatch->cFaults));
 
2548
            Log(("target    = %x\n", pPatch->pJumpTarget));
2534
2549
            
2535
2550
            rc = RTAvloU32Insert(&pVM->hwaccm.s.svm.PatchTree, &pPatch->Core);
2536
2551
            AssertRC(rc);