From fbe127cdf49cecd62867c0b0d879b9802b139037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Tue, 23 Aug 2016 16:07:44 +0200 Subject: [PATCH] vbox: fix ACPI dsl for newer iASL versions The patch reflects the changes done in VirtualBox 5 and is at least needed on Ubuntu 16.04. Fixes #2068. --- repos/ports/ports/virtualbox.hash | 2 +- repos/ports/src/virtualbox/patches/series | 1 + .../patches/vbox-cpuhotplug.dsl.patch | 30 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 repos/ports/src/virtualbox/patches/vbox-cpuhotplug.dsl.patch diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash index c4109f825..14bdf9e4c 100644 --- a/repos/ports/ports/virtualbox.hash +++ b/repos/ports/ports/virtualbox.hash @@ -1 +1 @@ -d2beb20e61ac2fa809c41a656e4b2c3c71ead4f6 +8163ec9421249f80de3e717555c3919a25d125fa diff --git a/repos/ports/src/virtualbox/patches/series b/repos/ports/src/virtualbox/patches/series index f2ac14642..7877d02bb 100644 --- a/repos/ports/src/virtualbox/patches/series +++ b/repos/ports/src/virtualbox/patches/series @@ -9,3 +9,4 @@ usb.patch tm_smp.patch vbox_dd.patch force_ioapic.patch +vbox-cpuhotplug.dsl.patch diff --git a/repos/ports/src/virtualbox/patches/vbox-cpuhotplug.dsl.patch b/repos/ports/src/virtualbox/patches/vbox-cpuhotplug.dsl.patch new file mode 100644 index 000000000..ecfa57768 --- /dev/null +++ b/repos/ports/src/virtualbox/patches/vbox-cpuhotplug.dsl.patch @@ -0,0 +1,30 @@ +--- a/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl ++++ b/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl +@@ -27,6 +27,18 @@ + Return(LEqual(CPUL, 0x01)) + } + ++ // Method to notify the VMM that a CPU is not ++ // in use anymore and can be safely removed. ++ // Using the extra method here because the CPUL ++ // register identifer clashes with the CPUL object defined ++ // below making iasl starting with version 20150930 fail. ++ // ++ // Think of CPLO as "CPU Lock Open" ++ Method(CPLO, 1) ++ { ++ Store (Arg0, CPUL) ++ } ++ + Scope (\_SB) + { + +@@ -73,7 +85,7 @@ + } \ + Method(_EJ0, 1) \ + { \ +- Store(id, CPUL) /* Unlock the CPU */ \ ++ CPLO(id) /* Unlock the CPU */ \ + Return \ + } \ + } \