Changeset 19007 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 18, 2009 8:07:59 AM (16 years ago)

Author:

vboxsync

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

46106

Message:

Main: centralized control for extended device profiles, ACPI cleanup

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -480 +480 @@
     rc = CFGMR3InsertInteger(pInst, "PCIBusNo",             1);/* ->pcibridge[0] */ RC_CHECK();
 #endif
+    
+    
+    Bstr tmpStr;
+    rc = pMachine->GetExtraData(Bstr("VBoxInternal/Devices/SupportExtHwProfile"), tmpStr.asOutParam());
+
+    BOOL fExtProfile;
+
+    if (SUCCEEDED(rc))
+        fExtProfile = (tmpStr == Bstr("on"));
+    else
+        fExtProfile = false;
 
     /*
@@ -485 +496 @@
      */
     BOOL fHpetEnabled;
-    /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_HPET
-    fHpetEnabled = true;
+    fHpetEnabled = fExtProfile;
 #else
     fHpetEnabled = false;
@@ -503 +513 @@
      */
     BOOL fSmcEnabled;
-    /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_SMC
-    fSmcEnabled = true;
+    fSmcEnabled = fExtProfile;
 #else
     fSmcEnabled = false;
@@ -522 +531 @@
     /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_LPC
-    fLpcEnabled = true;
+    fLpcEnabled = fExtProfile;
 #else
     fLpcEnabled = false;
@@ -658 +667 @@
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();
 #endif
+        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc", fExtProfile);                    RC_CHECK();      
+        rc = CFGMR3InsertInteger(pCfg,  "ShowCpu", fExtProfile);                    RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          7);                 RC_CHECK();
         Assert(!afPciDeviceNo[7]);