Changeset 27393 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 16, 2010 11:29:32 AM (15 years ago)

Author:

vboxsync

Message:

Devices/ACPI: fixed a missing break after case SYSTEM_INFO_INDEX_CPUx_STATUS: and make the RTC device real hiding by default

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (6 diffs)
• vbox.dsl (modified) (1 diff)

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

@@ -1484 +1484 @@
                                            | STA_DEVICE_SHOW_IN_UI_MASK
                                            | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
+                                        : 0;
                     break;
 
@@ -1492 +1492 @@
                                           /* no need to show this device in the UI */
                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
+                                       : 0;
                     break;
 
@@ -1500 +1500 @@
                                           | STA_DEVICE_SHOW_IN_UI_MASK
                                           | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
+                                       : 0;
                     break;
-
 
                 case SYSTEM_INFO_INDEX_CPU0_STATUS:
@@ -1508 +1507 @@
                 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;
+                    *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:
@@ -1523 +1523 @@
                                            | STA_DEVICE_SHOW_IN_UI_MASK
                                            | STA_DEVICE_FUNCTIONING_PROPERLY_MASK)
-                            : 0;
+                                        : 0;
                     break;
 
@@ -1543 +1543 @@
 
                 case SYSTEM_INFO_INDEX_CPU_EVENT_TYPE:
-                {
                     *pu32 = s->u32CpuEventType;
                     break;
-                }
 
                 case SYSTEM_INFO_INDEX_CPU_EVENT:
-                {
                     *pu32 = s->u32CpuEvent;
                     break;
-                }
 
                 /* Solaris 9 tries to read from this index */

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

@@ -701 +701 @@
                     Method (_STA, 0, NotSerialized)
                     {
-                       Return (0x0f)
+                       Return (URTC)
                     }
                 }