← Back to branch summary

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

« back to all changes in this revision

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

  • 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/CPUMInternal.h
285
285
        uint32_t            ecx;
286
286
    } CPUFeaturesExt;
287
287
 
288
 
    /* CPU manufacturer. */
289
 
    CPUMCPUVENDOR           enmCPUVendor;
 
288
    /* Host CPU manufacturer. */
 
289
    CPUMCPUVENDOR           enmHostCpuVendor;
 
290
    /* Guest CPU manufacturer. */
 
291
    CPUMCPUVENDOR           enmGuestCpuVendor;
290
292
 
291
293
    /** CR4 mask */
292
294
    struct
297
299
 
298
300
    /** Have we entered rawmode? */
299
301
    bool                    fRawEntered;
300
 
    uint8_t                 abPadding[3 + (HC_ARCH_BITS == 64) * 4];
 
302
    /** Synthetic CPU type? */
 
303
    bool                    fSyntheticCpu;
 
304
    uint8_t                 abPadding[2 + (HC_ARCH_BITS == 64) * 4];
301
305
 
302
306
    /** The standard set of CpuId leafs. */
303
307
    CPUMCPUID               aGuestCpuIdStd[6];
308
312
    /** The default set of CpuId leafs. */
309
313
    CPUMCPUID               GuestCpuIdDef;
310
314
 
 
315
#if HC_ARCH_BITS == 32
311
316
    /** Align the next member, and thereby the structure, on a 64-byte boundrary. */
312
 
    uint8_t                 abPadding2[HC_ARCH_BITS == 32 ? 8 : 4];
 
317
    uint8_t                 abPadding2[4];
 
318
#endif
313
319
 
314
320
    /**
315
321
     * Guest context on raw mode entry.