Changeset 27666 in vbox

Timestamp:

Mar 24, 2010 1:15:14 PM (15 years ago)

Author:

vboxsync

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

59246

Message:

DevACPI.cpp: Restored code removed in r58897 as it is techincally still required for some really (?) odd restore scenarios.

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (2 diffs)

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,  /**< For compatability with older saved states. */
+    SYSTEM_INFO_INDEX_CPU1_STATUS       = 6,  /**< For compatability with older saved states. */
+    SYSTEM_INFO_INDEX_CPU2_STATUS       = 7,  /**< For compatability with older saved states. */
+    SYSTEM_INFO_INDEX_CPU3_STATUS       = 8,  /**< For compatability with older saved states. */
     SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 9,
     SYSTEM_INFO_INDEX_RTC_STATUS        = 10,
@@ -1499 +1503 @@
                     break;
 
+                /* This is only for compatability with older saved states that
+                   may include ACPI code that read these values.  Legacy is
+                   a wonderful thing, isn't it? :-) */
+                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:
                     *pu32 = s->fShowRtc ? (  STA_DEVICE_PRESENT_MASK