Changeset 27422 in vbox for trunk/src/VBox

Timestamp:

Mar 16, 2010 6:20:53 PM (15 years ago)

Author:

vboxsync

Message:

ACPI: cleaned up no longer used CPU entries, made RTC on by default

Location:

trunk/src/VBox

Files:

• Devices/PC/DevACPI.cpp (modified) (2 diffs)
• Devices/PC/vbox.dsl (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -153 +153 @@
     SYSTEM_INFO_INDEX_SMC_STATUS        = 3,
     SYSTEM_INFO_INDEX_FDC_STATUS        = 4,
-    SYSTEM_INFO_INDEX_CPU0_STATUS       = 5,
-    SYSTEM_INFO_INDEX_CPU1_STATUS       = 6,
-    SYSTEM_INFO_INDEX_CPU2_STATUS       = 7,
-    SYSTEM_INFO_INDEX_CPU3_STATUS       = 8,
     SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 9,
     SYSTEM_INFO_INDEX_RTC_STATUS        = 10,
@@ -1503 +1499 @@
                     break;
 
-                case SYSTEM_INFO_INDEX_CPU0_STATUS:
-                case SYSTEM_INFO_INDEX_CPU1_STATUS:
-                case SYSTEM_INFO_INDEX_CPU2_STATUS:
-                case SYSTEM_INFO_INDEX_CPU3_STATUS:
-                    *pu32 = (   s->fShowCpu
-                             && s->uSystemInfoIndex - SYSTEM_INFO_INDEX_CPU0_STATUS < s->cCpus
-                             && VMCPUSET_IS_PRESENT(&s->CpuSetAttached,
-                                                    s->uSystemInfoIndex - SYSTEM_INFO_INDEX_CPU0_STATUS))
-                                        ? (  STA_DEVICE_PRESENT_MASK
-                                           | STA_DEVICE_ENABLED_MASK
-                                           | STA_DEVICE_SHOW_IN_UI_MASK
-                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                                        : 0;
-                    break;
-
-                 case SYSTEM_INFO_INDEX_RTC_STATUS:
+                case SYSTEM_INFO_INDEX_RTC_STATUS:
                     *pu32 = s->fShowRtc ? (  STA_DEVICE_PRESENT_MASK
                                            | STA_DEVICE_ENABLED_MASK

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -137 +137 @@
             USMC,  32,
             UFDC,  32,
-            // @todo: maybe make it bitmask instead?
+            // UCP0-UCP3 no longer used and only kept here for saved state compatibilty
             UCP0,  32,
             UCP1,  32,
@@ -167 +167 @@
             DBG ("UFDC: ")
             HEX4 (UFDC)
-            DBG ("UCP0: ")
-            HEX4 (UCP0)
             DBG ("MEMH: ")
             HEX4 (MEMH)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2172 +2172 @@
         rc = CFGMR3InsertInteger(pCfg,  "FdcEnabled", fFdcEnabled);                 RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "HpetEnabled", fHpetEnabled);               RC_CHECK();
-#ifdef VBOX_WITH_SMC
         rc = CFGMR3InsertInteger(pCfg,  "SmcEnabled", fSmcEnabled);                 RC_CHECK();
-#endif
-        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc", fExtProfile);                    RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "ShowRtc",    true);                        RC_CHECK();
 
         rc = CFGMR3InsertInteger(pCfg,  "ShowCpu", fShowCpu);                       RC_CHECK();