~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/VMM/CPUMInternal.mac

  • 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
* 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:
63
63
    .CPUFeaturesExt.edx   resd    1
64
64
    .CPUFeaturesExt.ecx   resd    1
65
65
 
66
 
    .enmCPUVendor         resd    1
 
66
    .enmHostCpuVendor     resd    1
 
67
    .enmGuestCpuVendor    resd    1
67
68
 
68
69
    ; CR4 masks
69
70
    .CR4.AndMask          resd    1
70
71
    .CR4.OrMask           resd    1
71
72
    ; entered rawmode?
72
73
    .fRawEntered          resb    1
 
74
    .fSyntheticCpu        resb    1
73
75
%if RTHCPTR_CB == 8
74
 
    .abPadding            resb    7
 
76
    .abPadding            resb    6
75
77
%else
76
 
    .abPadding            resb    3
 
78
    .abPadding            resb    2
77
79
%endif
78
80
 
79
81
    ; CPUID leafs