← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Main/xml/Settings.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - 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
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/xml/Settings.cpp
1249
1249
        : strVersion("1"),
1250
1250
          fHardwareVirt(true),
1251
1251
          fHardwareVirtExclusive(HWVIRTEXCLUSIVEDEFAULT),
1252
 
          fNestedPaging(false),
1253
 
          fVPID(false),
 
1252
          fNestedPaging(true),
 
1253
          fVPID(true),
1254
1254
          fSyntheticCpu(false),
1255
1255
          fPAE(false),
1256
1256
          cCPUs(1),
1955
1955
            throw ConfigFileError(this, pelmController, N_("Required StorageController/@name attribute is missing"));
1956
1956
        //  canonicalize storage controller names for configs in the switchover
1957
1957
        //  period.
1958
 
        if (m->sv <= SettingsVersion_v1_9)
 
1958
        if (m->sv < SettingsVersion_v1_9)
1959
1959
        {
1960
1960
            if (sctl.strName == "IDE")
1961
1961
                sctl.strName = "IDE Controller";
2914
2914
 
2915
2915
                case DeviceType_DVD:
2916
2916
                    pcszType = "DVD";
2917
 
                    if (att.fPassThrough)
2918
 
                        pelmDevice->setAttribute("passthrough", att.fPassThrough);
 
2917
                    pelmDevice->setAttribute("passthrough", att.fPassThrough);
2919
2918
                break;
2920
2919
 
2921
2920
                case DeviceType_Floppy: