Changeset 26459 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Feb 12, 2010 11:42:36 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57608

Message:

Main: HPET machine property, cleanups

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (6 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1466 +1466 @@
           cCPUs(1),
           fCpuHotPlug(false),
+          fHpetEnabled(false),
           ulMemorySizeMB((uint32_t)-1),
           ulVRAMSizeMB(8),
@@ -1509 +1510 @@
                   && (cCPUs                     == h.cCPUs)
                   && (fCpuHotPlug               == h.fCpuHotPlug)
+                  && (fHpetEnabled              == h.fHpetEnabled)
                   && (llCpus                    == h.llCpus)
                   && (llCpuIdLeafs              == h.llCpuIdLeafs)
@@ -2093 +2095 @@
             }
         }
+        else if (pelmHwChild->nameEquals("HPET"))
+        {
+            pelmHwChild->getAttributeValue("enabled", hw.fHpetEnabled);
+        }
         else if (pelmHwChild->nameEquals("Boot"))
         {
@@ -2987 +2993 @@
     }
 
+    if (    (m->sv >= SettingsVersion_v1_10)
+       )
+    {
+         xml::ElementNode *pelmHpet = pelmHardware->createChild("HPET");
+         pelmHpet->setAttribute("enabled", hw.fHpetEnabled);
+    }
+
     xml::ElementNode *pelmBoot = pelmHardware->createChild("Boot");
     for (BootOrderMap::const_iterator it = hw.mapBootOrder.begin();
@@ -3556 +3569 @@
     }
 
+    // VirtualBox 3.2 adds support for CPU hotplug, RTC timezone control, HID type and HPET
     if (    m->sv < SettingsVersion_v1_10
          && (    fRTCUseUTC
@@ -3561 +3575 @@
               || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
               || hardwareMachine.keyboardHidType != KeyboardHidType_PS2Keyboard
+              || hardwareMachine.fHpetEnabled
             )
        )