← 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-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/xml/Settings.cpp
1462
1462
          fNestedPaging(true),
1463
1463
          fLargePages(false),
1464
1464
          fVPID(true),
 
1465
          fHardwareVirtForce(false),
1465
1466
          fSyntheticCpu(false),
1466
1467
          fPAE(false),
1467
1468
          cCPUs(1),
1507
1508
                  && (fNestedPaging             == h.fNestedPaging)
1508
1509
                  && (fLargePages               == h.fLargePages)
1509
1510
                  && (fVPID                     == h.fVPID)
 
1511
                  && (fHardwareVirtForce        == h.fHardwareVirtForce)
1510
1512
                  && (fSyntheticCpu             == h.fSyntheticCpu)
1511
1513
                  && (fPAE                      == h.fPAE)
1512
1514
                  && (cCPUs                     == h.cCPUs)
2188
2190
                pelmCPUChild->getAttributeValue("enabled", hw.fLargePages);
2189
2191
            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtExVPID")))
2190
2192
                pelmCPUChild->getAttributeValue("enabled", hw.fVPID);
 
2193
            if ((pelmCPUChild = pelmHwChild->findChildElement("HardwareVirtForce")))
 
2194
                pelmCPUChild->getAttributeValue("enabled", hw.fHardwareVirtForce);            
2191
2195
 
2192
2196
            if (!(pelmCPUChild = pelmHwChild->findChildElement("PAE")))
2193
2197
            {
3085
3089
 
3086
3090
    if (hw.fLargePages)
3087
3091
        pelmCPU->createChild("HardwareVirtExLargePages")->setAttribute("enabled", hw.fLargePages);
 
3092
    
 
3093
    if (m->sv >= SettingsVersion_v1_9)
 
3094
        pelmCPU->createChild("HardwareVirtForce")->setAttribute("enabled", hw.fHardwareVirtForce);    
3088
3095
 
3089
3096
    if (m->sv >= SettingsVersion_v1_10)
3090
3097
    {