VirtualBox 3.2.0-beta-1 fails to compile on -current

[Jung-uk Kim]

On Thursday 29 April 2010 09:02 pm, Michael Butler wrote:
> On 04/29/10 19:23, Jung-uk Kim wrote:
> > I read the source again and I found it is not "patched" by the
> > emulator itself.  It's done from usual _CRS method.  Please try
> > the attached patch instead.
>
> Now I get ..
>
> kBuild: iasl DevicesR3 -
> /usr/home/imb/svn/virtualbox-ose/work/VirtualBox-3.2.0_OSE/src/VBox
>/Devices/PC/vbox-cpuhotplug.dsl
> /usr/home/imb/svn/virtualbox-ose/work/VirtualBox-3.2.0_OSE/out/free
>bsd.x86/release/obj/DevicesR3/vboxssdt-cpuhotplug.hex.pre 14:       
>  Device (SCK0) { Name (_HID, "ACPI0004") Name (_UID, "SCKCPU0")
> Processor (CPU0, 0x00, 0x0, 0x0 ) { Name (_HID, "ACPI0007") Name
> (_UID, "SCK0-CPU0") Name (_PXM, 0x00) Method(_MAT, 0) { IF
> (CPCK(0x00)) { Name (APIC, Buffer (8) {0x00, 0x08, 0x00, 0x00,
> 0x01}) Return(APIC) } Else { Return (0x00) } } Method(_STA) { IF
> (CPCK(0x00)) { Return (0xF) } Else { Return (0x0) } } Method(_EJ0,
> 1) { Store(0x00, \_SB.CPUL) Return } } }
>
> Error    4080 -
>
>
>
>
>                                 Invalid object type for reserved
> name ^ (found INTEGER, requires Buffer)
>
>  .. where the "Return(0x00)" as the alternate result to
> "Result(APIC)" is causing an issue,

Sigh...  A new file, a new bug. :-(

Try the attached patch.

Jung-uk Kim
-------------- next part --------------
--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig	2010-04-27 16:24:02.000000000 -0400
+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl	2010-04-30 13:41:15.000000000 -0400
@@ -49,15 +49,16 @@
                                                                            \
             Method(_MAT, 0)                                                \
             {                                                              \
+                Name (APIC, Buffer (8) {0x00, 0x08, id, id})               \
                 IF (CPCK(id))                                              \
                 {                                                          \
-                    Name (APIC, Buffer (8) {0x00, 0x08, id, id, 0x01})     \
-                    Return(APIC)                                           \
+                    Store (One, Index (APIC, 4))                           \
                 }                                                          \
                 Else                                                       \
                 {                                                          \
-                    Return (0x00)                                          \
+                    Store (Zero, Index (APIC, 4))                          \
                 }                                                          \
+                Return (APIC)                                              \
             }                                                              \
             Method(_STA) /* Used for device presence detection */          \
             {                                                              \