Changeset 28580 in vbox

Timestamp:

Apr 22, 2010 7:21:06 AM (15 years ago)

Author:

vboxsync

Message:

review feedback

Location:

trunk/src/VBox

Files:

• Devices/EFI/DevEFI.cpp (modified) (1 diff)
• Devices/PC/DevFwCommon.cpp (modified) (2 diffs)
• Devices/PC/DevPcBios.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -1012 +1012 @@
 #endif
                               "DmiUseHostInfo\0"
-                              "DmiExposeAdditionalTables\0"
+                              "DmiExposeMemoryTable\0"
                               "64BitEntry\0"
                               "BootArgs\0"

trunk/src/VBox/Devices/PC/DevFwCommon.cpp

@@ -511 +511 @@
         fwCommonUseHostDMIStrings();
 
-    uint8_t fDmiExposeAdditionalTables;
-    rc = CFGMR3QueryU8Def(pCfg, "DmiExposeAdditionalTables", &fDmiExposeAdditionalTables, 0);
+    uint8_t fDmiExposeMemoryTable;
+    rc = CFGMR3QueryU8Def(pCfg, "DmiExposeMemoryTable", &fDmiExposeMemoryTable, 0);
     if (RT_FAILURE (rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"DmiExposeAdditionalTables\""));
+                                N_("Configuration error: Failed to read \"DmiExposeMemoryTable\""));
 
     for  (;; fForceDefault = true, fHideErrors = false)
@@ -677 +677 @@
         TERM_STRUCT;
 
-        if (fDmiExposeAdditionalTables)
+        if (fDmiExposeMemoryTable)
         {
             /***************************************

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -948 +948 @@
 #endif
                               "DmiUseHostInfo\0"
-                              "DmiExposeAdditionalTables\0"
+                              "DmiExposeMemoryTable\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -674 +674 @@
      * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests
      */
-    BOOL fExtProfile = fOsXGuest;
-
     /*
      * High Precision Event Timer (HPET)
@@ -684 +682 @@
     hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                          H();
     /* so always enable HPET in extended profile */
-    fHpetEnabled |= fExtProfile;
+    fHpetEnabled |= fOsXGuest;
 #else
     fHpetEnabled = false;
@@ -700 +698 @@
     BOOL fSmcEnabled;
 #ifdef VBOX_WITH_SMC
-    fSmcEnabled = fExtProfile;
+    fSmcEnabled = fOsXGuest;
 #else
     fSmcEnabled = false;
@@ -721 +719 @@
     /** @todo: implement appropriate getter */
 #ifdef VBOX_WITH_LPC
-    fLpcEnabled = fExtProfile;
+    fLpcEnabled = fOsXGuest;
 #else
     fLpcEnabled = false;
@@ -1044 +1042 @@
 
         /* For OS X guests we'll force passing host's DMI info to the guest */
-        if (fExtProfile)
+        if (fOsXGuest)
         {
             rc = CFGMR3InsertInteger(pCfg,  "DmiUseHostInfo", 1);                        RC_CHECK();
-            rc = CFGMR3InsertInteger(pCfg,  "DmiExposeAdditionalTables", 1);             RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "DmiExposeMemoryTable", 1);                  RC_CHECK();
         }
     }
@@ -2225 +2223 @@
     {
         BOOL fCpuHotPlug = false;
-        BOOL fShowCpu = fExtProfile;
+        BOOL fShowCpu = fOsXGuest;
         /* Always show the CPU leafs when we have multiple VCPUs or when the IO-APIC is enabled.
          * The Windows SMP kernel needs a CPU leaf or else its idle loop will burn cpu cycles; the
@@ -2247 +2245 @@
         rc = CFGMR3InsertInteger(pCfg,  "HpetEnabled", fHpetEnabled);               RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc",    fExtProfile);                 RC_CHECK();
-        if (fExtProfile && !llBootNics.empty())
+        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc",    fOsXGuest);                   RC_CHECK();
+        if (fOsXGuest && !llBootNics.empty())
         {
             BootNic aNic = llBootNics.front();