[Qemu-devel] [PULL for-2.0] acpi bug fix

[Qemu-devel] [PULL for-2.0] acpi bug fix

[Michael S. Tsirkin]

The following changes since commit 55519a4b244e4822774b593e36647ecf7598286b:

  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging (2014-04-07 17:57:23 +0100)

are available in the git repository at:


  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

for you to fetch changes up to f2ccc311df55ec026a8f8ea9df998f26314f22b2:

  dsdt: tweak ACPI ID for hotplug resource device (2014-04-08 15:22:59 +0300)

----------------------------------------------------------------
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>

----------------------------------------------------------------
Michael S. Tsirkin (1):
      dsdt: tweak ACPI ID for hotplug resource device

 hw/i386/acpi-dsdt-cpu-hotplug.dsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL for-2.0] dsdt: tweak ACPI ID for hotplug resource device

[Michael S. Tsirkin]

ACPI0004 seems too new:
Windows XP complains about an unrecognized device.
This is a regression since 1.7.
Use PNP0A06 instead - Generic Container Device.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-By: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-dsdt-cpu-hotplug.dsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
index dee4843..34aab5a 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)
-- 
MST

Re: [Qemu-devel] [PULL for-2.0] acpi bug fix

[Peter Maydell]

On 8 April 2014 13:24, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 55519a4b244e4822774b593e36647ecf7598286b:
>
>   Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging (2014-04-07 17:57:23 +0100)
>
> are available in the git repository at:
>
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to f2ccc311df55ec026a8f8ea9df998f26314f22b2:
>
>   dsdt: tweak ACPI ID for hotplug resource device (2014-04-08 15:22:59 +0300)
>
> ----------------------------------------------------------------
> 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>

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL for-2.0] dsdt: tweak ACPI ID for hotplug resource device

[Igor Mammedov]

On Tue,  8 Apr 2014 15:24:18 +0300
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> ACPI0004 seems too new:
> Windows XP complains about an unrecognized device.
> This is a regression since 1.7.
> Use PNP0A06 instead - Generic Container Device.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Reviewed-By: Igor Mammedov <imammedo@redhat.com>
> ---
>  hw/i386/acpi-dsdt-cpu-hotplug.dsl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
> index dee4843..34aab5a 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)

There is a need to update test cases with new DSDTs, since it breaks them.