← Back to branch summary

~ubuntu-branches/ubuntu/karmic/virtualbox-ose/karmic-updates

« back to all changes in this revision

Viewing changes to include/VBox/vm.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-09-14 18:25:07 UTC
  • mfrom: (0.4.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090914182507-c98g07mq16hjmn6d
Tags: 3.0.6-dfsg-1ubuntu1
https://launchpad.net/bugs/429697
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/379878
* Merge from debian unstable (LP: #429697), 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
  - virtualbox, virtualbox-* (names of the upstream proprietary packages)
    conflict with virtualbox-ose (LP: #379878)
* Make debug package depend on normal or guest utils package
* Drop patches/22-pulseaudio-stubs.dpatch (applied upstream)
* Rename Ubuntu specific patches to uXX-*.dpatch
* Fix lintian warnings in maintainer scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/VBox/vm.h
1
1
/** @file
2
 
 * VM - The Virtual Machine, data.
 
2
 * VM - The Virtual Machine, data. (VMM)
3
3
 */
4
4
 
5
5
/*
142
142
#ifdef ___HWACCMInternal_h
143
143
        struct HWACCMCPU    s;
144
144
#endif
145
 
        char                padding[5120];      /* multiple of 64 */
 
145
        char                padding[6144];      /* multiple of 64 */
146
146
    } hwaccm;
147
147
 
148
148
    /** EM part. */
625
625
 */
626
626
#define VM_ASSERT_VALID_EXT_RETURN(pVM, rc) \
627
627
        AssertMsgReturn(    RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
628
 
                        &&  (unsigned)(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING, \
 
628
                        &&  (   (unsigned)(pVM)->enmVMState < (unsigned)VMSTATE_DESTROYING \
 
629
                             || (   (unsigned)(pVM)->enmVMState == (unsigned)VMSTATE_DESTROYING \
 
630
                                 && VM_IS_EMT(pVM))), \
629
631
                        ("pVM=%p state %s\n", (pVM), RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
630
632
                         ? VMGetStateName(pVM->enmVMState) : ""), \
631
633
                        (rc))
832
834
#ifdef ___HWACCMInternal_h
833
835
        struct HWACCM s;
834
836
#endif
835
 
        char        padding[512];       /* multiple of 32 */
 
837
        char        padding[8192];       /* multiple of 32 */
836
838
    } hwaccm;
837
839
 
838
840
    /** TRPM part. */
998
1000
/** @} */
999
1001
 
1000
1002
#endif
1001