[Qemu-devel] [PULL for-2.0 v2 0/2] acpi: DSDT update

[Qemu-devel] [PULL for-2.0 v2 0/2] acpi: DSDT update

[Michael S. Tsirkin]

The following changes since commit efcc87d9aedb590b8506cd1a7c8abe557c760f9e:

  Update version for v2.0.0-rc2 release (2014-04-08 18:52:06 +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 775478418a5244b28ce891e398e0232dc4e60b43:

  acpi: update generated hex files (2014-04-10 19:03:18 +0300)

----------------------------------------------------------------
acpi: DSDT update

Two fixes here:
- Test fix to avoid warning with make check.
- Hex file update so people building QEMU
  without installing iasl get exactly the same ACPI
  as with.

Both should help avoid user confusion.

As it's very easy to check that the produced ACPI
binary didn't change, I think these are very low risk.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Michael S. Tsirkin (2):
      tests/acpi: update expected DSDT files
      acpi: update generated hex files

 hw/i386/acpi-dsdt.hex.generated     |  25 ++++++++++---------------
 hw/i386/q35-acpi-dsdt.hex.generated |  25 ++++++++++---------------
 tests/acpi-test-data/pc/DSDT        | Bin 4485 -> 4480 bytes
 tests/acpi-test-data/q35/DSDT       | Bin 7383 -> 7378 bytes
 4 files changed, 20 insertions(+), 30 deletions(-)

[Qemu-devel] [PULL for-2.0 v2 1/2] tests/acpi: update expected DSDT files

[Michael S. Tsirkin]

commit f2ccc311df55ec026a8f8ea9df998f26314f22b2
    dsdt: tweak ACPI ID for hotplug resource device
changes the DSDT, update test expected files to match

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Igor Mammedov <imammedo@redhat.com>
---
 tests/acpi-test-data/pc/DSDT  | Bin 4485 -> 4480 bytes
 tests/acpi-test-data/q35/DSDT | Bin 7383 -> 7378 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index 8b14a5f6f2012dc9bfd01f13931100f002e99391..d0bb3de79d2ff98736e8a54e6e8859ab4efeaf03 100644
GIT binary patch
delta 45
zcmZowZcyfO33dr-5M*Fr+`Ex$AwQ$j<Td;+_%#E9T!T5{Jv?1_94~OOO<o~z7XT?9
B4Z8pU

delta 50
zcmZorZdK-T33dr-6=Yywe7lirAwQ%0<Td;+MDzlJT!T5{Jv?1_9i0O_4GauS7$z?k
GxC;Pq#typx

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index a76ea9a418bea57c2d685b3a1b0221defd02b447..fc5b9700097d621ac76c59cf2596ead9d61c20a6 100644
GIT binary patch
delta 45
zcmca^dC8K?CD<k8k_-a_W8p?FHEBkt$%fJ|_%#E9T!T5{Jv?1_94~OOP1coJ1pqk4
B4IBUf

delta 50
zcmca)dEJuBCD<k8x(ovY<HC(xYSN7ElMSU`i0B0bxdwB@dw9C=Iywh<8W<RuFih5v
GSp@)qeGVJ|

-- 
MST

[Qemu-devel] [PULL for-2.0 v2 2/2] acpi: update generated hex files

[Michael S. Tsirkin]

commit f2ccc311df55ec026a8f8ea9df998f26314f22b2
    dsdt: tweak ACPI ID for hotplug resource device
changes the DSDT, update hex files to match

Otherwise the fix is only effective if QEMU is built
with iasl.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/acpi-dsdt.hex.generated     | 25 ++++++++++---------------
 hw/i386/q35-acpi-dsdt.hex.generated | 25 ++++++++++---------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/hw/i386/acpi-dsdt.hex.generated b/hw/i386/acpi-dsdt.hex.generated
index 94c6e8e..e61572a 100644
--- a/hw/i386/acpi-dsdt.hex.generated
+++ b/hw/i386/acpi-dsdt.hex.generated
@@ -3,12 +3,12 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x53,
 0x44,
 0x54,
-0x85,
+0x80,
 0x11,
 0x0,
 0x0,
 0x1,
-0x8b,
+0x60,
 0x42,
 0x58,
 0x50,
@@ -31,8 +31,8 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x4e,
 0x54,
 0x4c,
-0x23,
-0x8,
+0x15,
+0x11,
 0x13,
 0x20,
 0x10,
@@ -4010,7 +4010,7 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x53,
 0x1,
 0x10,
-0x47,
+0x42,
 0x11,
 0x5f,
 0x53,
@@ -4243,7 +4243,7 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x60,
 0x5b,
 0x82,
-0x2e,
+0x29,
 0x50,
 0x52,
 0x45,
@@ -4253,16 +4253,11 @@ static unsigned char AcpiDsdtAmlCode[] = {
 0x48,
 0x49,
 0x44,
-0xd,
+0xc,
 0x41,
-0x43,
-0x50,
-0x49,
-0x30,
-0x30,
-0x30,
-0x34,
-0x0,
+0xd0,
+0xa,
+0x6,
 0x8,
 0x5f,
 0x43,
diff --git a/hw/i386/q35-acpi-dsdt.hex.generated b/hw/i386/q35-acpi-dsdt.hex.generated
index 6c29f3b..6b788c9 100644
--- a/hw/i386/q35-acpi-dsdt.hex.generated
+++ b/hw/i386/q35-acpi-dsdt.hex.generated
@@ -3,12 +3,12 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x53,
 0x44,
 0x54,
-0xd7,
+0xd2,
 0x1c,
 0x0,
 0x0,
 0x1,
-0x3e,
+0x13,
 0x42,
 0x58,
 0x50,
@@ -31,8 +31,8 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x4e,
 0x54,
 0x4c,
-0x23,
-0x8,
+0x15,
+0x11,
 0x13,
 0x20,
 0x10,
@@ -6959,7 +6959,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x53,
 0x1,
 0x10,
-0x47,
+0x42,
 0x11,
 0x5f,
 0x53,
@@ -7192,7 +7192,7 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x60,
 0x5b,
 0x82,
-0x2e,
+0x29,
 0x50,
 0x52,
 0x45,
@@ -7202,16 +7202,11 @@ static unsigned char Q35AcpiDsdtAmlCode[] = {
 0x48,
 0x49,
 0x44,
-0xd,
+0xc,
 0x41,
-0x43,
-0x50,
-0x49,
-0x30,
-0x30,
-0x30,
-0x34,
-0x0,
+0xd0,
+0xa,
+0x6,
 0x8,
 0x5f,
 0x43,
-- 
MST

Re: [Qemu-devel] [PULL for-2.0 v2 0/2] acpi: DSDT update

[Peter Maydell]

On 10 April 2014 17:12, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit efcc87d9aedb590b8506cd1a7c8abe557c760f9e:
>
>   Update version for v2.0.0-rc2 release (2014-04-08 18:52:06 +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 775478418a5244b28ce891e398e0232dc4e60b43:
>
>   acpi: update generated hex files (2014-04-10 19:03:18 +0300)

Applied, thanks.

-- PMM