Changeset 19118 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2009 8:05:55 PM (16 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: VBoxInternal/Devices/SupportExtHwProfile -> VBoxInternal2/Devices/SupportExtHwProfile; VBoxInternal2/UseEFI.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -357 +357 @@
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
 
-    BOOL fEfiEnabled;
+    /*
+     * Firmware.
+     */
+#ifdef VBOX_WITH_EFI
     /** @todo: implement appropriate getter */
-#ifdef VBOX_WITH_EFI
-    fEfiEnabled = true;
+    Bstr tmpStr1;
+    hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/UseEFI"), tmpStr1.asOutParam());    H();
+    BOOL fEfiEnabled = tmpStr1 == Bstr("on");
 #else
-    fEfiEnabled = false;
-#endif
-
-    if (fEfiEnabled)
-    {
-        rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                       RC_CHECK();
-        rc = CFGMR3InsertNode(pDev,     "0", &pInst);                        RC_CHECK();
-        rc = CFGMR3InsertInteger(pInst, "Trusted",   1);     /* boolean */   RC_CHECK();
-    }
-
-    /*
-     * PC Bios.
-     */
+    BOOL fEfiEnabled = false;
+#endif
     if (!fEfiEnabled)
     {
+        /*
+         * PC Bios.
+         */
         rc = CFGMR3InsertNode(pDevices, "pcbios", &pDev);                               RC_CHECK();
         rc = CFGMR3InsertNode(pDev,     "0", &pInst);                                   RC_CHECK();
@@ -431 +427 @@
         }
     }
+    else
+    {
+        /*
+         * EFI.
+         */
+        rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                       RC_CHECK();
+        rc = CFGMR3InsertNode(pDev,     "0", &pInst);                        RC_CHECK();
+        rc = CFGMR3InsertInteger(pInst, "Trusted",   1);     /* boolean */   RC_CHECK();
+    }
 
     /*
@@ -481 +486 @@
 #endif
 
-
-    Bstr tmpStr;
-    rc = pMachine->GetExtraData(Bstr("VBoxInternal/Devices/SupportExtHwProfile"), tmpStr.asOutParam());
-
-    BOOL fExtProfile;
-
-    if (SUCCEEDED(rc))
-        fExtProfile = (tmpStr == Bstr("on"));
-    else
-        fExtProfile = false;
+    /*
+     * Temporary hack for enabling the next three devices and various ACPI features.
+     */
+    Bstr tmpStr2;
+    hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/SupportExtHwProfile"), tmpStr2.asOutParam()); H();
+    BOOL fExtProfile = tmpStr2 == Bstr("on");
 
     /*
@@ -501 +502 @@
     fHpetEnabled = false;
 #endif
-
     if (fHpetEnabled)
     {
@@ -535 +535 @@
     fLpcEnabled = false;
 #endif
-
     if (fLpcEnabled)
     {