summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-08 13:59:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-08 13:59:28 +0100
commit9bc1a1d817670702f642633a325da346047f7508 (patch)
tree3e6dce7b9f6e95c8e42cea75964579db2365c298
parent093de72b9c226fe007f330c70a0d4ccb0baec17d (diff)
parentf2ccc311df55ec026a8f8ea9df998f26314f22b2 (diff)
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi bug fix Here is a single last minute fix for 2.0 This changes the HID of the container used to claim resources for CPU hotplug. As a result, windows XP SP3 no longer brings up an annoying "found new hardware" wizard on boot. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Tue 08 Apr 2014 13:23:30 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: dsdt: tweak ACPI ID for hotplug resource device Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/i386/acpi-dsdt-cpu-hotplug.dsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
index dee4843cd..34aab5af4 100644
--- a/hw/i386/acpi-dsdt-cpu-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
@@ -93,7 +93,7 @@ Scope(\_SB) {
}
Device(CPU_HOTPLUG_RESOURCE_DEVICE) {
- Name(_HID, "ACPI0004")
+ Name(_HID, EisaId("PNP0A06"))
Name(_CRS, ResourceTemplate() {
IO(Decode16, CPU_STATUS_BASE, CPU_STATUS_BASE, 0, CPU_STATUS_LEN)