Changeset 19607 in vbox

Timestamp:

May 12, 2009 11:31:14 AM (16 years ago)

Author:

vboxsync

Message:

ACPI: increased maximum nr of supported VCPUs to 16; we should reconsider the way we build the table

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (2 diffs)
• vbox.dsl (modified) (3 diffs)

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

@@ -140 +140 @@
     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,
-    SYSTEM_INFO_INDEX_END               = 11,
+    SYSTEM_INFO_INDEX_CPU4_STATUS       = 9,
+    SYSTEM_INFO_INDEX_CPU5_STATUS       = 10,
+    SYSTEM_INFO_INDEX_CPU6_STATUS       = 11,
+    SYSTEM_INFO_INDEX_CPU7_STATUS       = 12,
+    SYSTEM_INFO_INDEX_CPU8_STATUS       = 13,
+    SYSTEM_INFO_INDEX_CPU9_STATUS       = 14,
+    SYSTEM_INFO_INDEX_CPUA_STATUS       = 15,
+    SYSTEM_INFO_INDEX_CPUB_STATUS       = 16,
+    SYSTEM_INFO_INDEX_CPUC_STATUS       = 17,
+    SYSTEM_INFO_INDEX_CPUD_STATUS       = 18,
+    SYSTEM_INFO_INDEX_CPUE_STATUS       = 19,
+    SYSTEM_INFO_INDEX_CPUF_STATUS       = 20,
+    SYSTEM_INFO_INDEX_HIGH_MEMORY_LENGTH= 21,
+    SYSTEM_INFO_INDEX_RTC_STATUS        = 22,
+    SYSTEM_INFO_INDEX_END               = 23,
     SYSTEM_INFO_INDEX_INVALID           = 0x80,
     SYSTEM_INFO_INDEX_VALID             = 0x200
@@ -1325 +1337 @@
                 case SYSTEM_INFO_INDEX_CPU2_STATUS:
                 case SYSTEM_INFO_INDEX_CPU3_STATUS:
+                case SYSTEM_INFO_INDEX_CPU4_STATUS:
+                case SYSTEM_INFO_INDEX_CPU5_STATUS:
+                case SYSTEM_INFO_INDEX_CPU6_STATUS:
+                case SYSTEM_INFO_INDEX_CPU7_STATUS:
+                case SYSTEM_INFO_INDEX_CPU8_STATUS:
+                case SYSTEM_INFO_INDEX_CPU9_STATUS:
+                case SYSTEM_INFO_INDEX_CPUA_STATUS:
+                case SYSTEM_INFO_INDEX_CPUB_STATUS:
+                case SYSTEM_INFO_INDEX_CPUC_STATUS:
+                case SYSTEM_INFO_INDEX_CPUD_STATUS:
+                case SYSTEM_INFO_INDEX_CPUE_STATUS:
+                case SYSTEM_INFO_INDEX_CPUF_STATUS:
                     *pu32 = s->fShowCpu
                          && s->uSystemInfoIndex - SYSTEM_INFO_INDEX_CPU0_STATUS < s->cCpus

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

@@ -128 +128 @@
     Scope (\_PR)
     {
-       Processor (CPU0, /* Name */
+        Processor (CPU0, /* Name */
                    0x00, /* Id */
                    0x0,  /* Processor IO ports range start */
@@ -159 +159 @@
         {
            Method (_STA) { Return(\_SB.UCP3) }
+        }
+        Processor (CPU4, /* Name */
+                   0x04, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP4) }
+        }
+        Processor (CPU5, /* Name */
+                   0x05, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP5) }
+        }
+        Processor (CPU6, /* Name */
+                   0x06, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP6) }
+        }
+        Processor (CPU7, /* Name */
+                   0x07, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP7) }
+        }
+        Processor (CPU8, /* Name */
+                   0x08, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP8) }
+        }
+        Processor (CPU9, /* Name */
+                   0x09, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCP9) }
+        }
+        Processor (CPUA, /* Name */
+                   0x0A, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPA) }
+        }
+        Processor (CPUB, /* Name */
+                   0x0B, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPB) }
+        }
+        Processor (CPUC, /* Name */
+                   0x0C, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPC) }
+        }
+        Processor (CPUD, /* Name */
+                   0x0D, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPD) }
+        }
+        Processor (CPUE, /* Name */
+                   0x0E, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPE) }
+        }
+        Processor (CPUF, /* Name */
+                   0x0F, /* Id */
+                   0x0,  /* Processor IO ports range start */
+                   0x0   /* Processor IO ports range length */
+                   )
+        {
+           Method (_STA) { Return(\_SB.UCPF) }
         }
     }
@@ -183 +279 @@
             UCP2,  32,
             UCP3,  32,
+            UCP4,  32,
+            UCP5,  32,
+            UCP6,  32,
+            UCP7,  32,
+            UCP8,  32,
+            UCP9,  32,
+            UCPA,  32,
+            UCPB,  32,
+            UCPC,  32,
+            UCPD,  32,
+            UCPE,  32,
+            UCPF,  32,
             MEMH,  32,
             URTC,  32,