[Spice-commits] 4 commits - configure hw/i386 tests/acpi-test-data

[Gerd Hoffmann]

 configure                           |    2 +-
 hw/i386/acpi-dsdt.hex.generated     |   25 ++++++++++---------------
 hw/i386/q35-acpi-dsdt.hex.generated |   25 ++++++++++---------------
 tests/acpi-test-data/pc/DSDT        |binary
 tests/acpi-test-data/q35/DSDT       |binary
 5 files changed, 21 insertions(+), 31 deletions(-)

New commits:
commit f516a5cc051db6e999e9e60dc968dcb5aeffe11f
Merge: 0a9077e 7754784
Author: Peter Maydell <peter.maydell at linaro.org>
Date:   Thu Apr 10 23:07:55 2014 +0100

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    
    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 at redhat.com>
    
    # gpg: Signature made Thu 10 Apr 2014 17:09:43 BST using RSA key ID D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst at kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst at redhat.com>"
    
    * remotes/mst/tags/for_upstream:
      acpi: update generated hex files
      tests/acpi: update expected DSDT files
    
    Signed-off-by: Peter Maydell <peter.maydell at linaro.org>

commit 0a9077ea144a7e6a6f456b94e2d2eaad21e74d34
Author: Peter Maydell <peter.maydell at linaro.org>
Date:   Wed Apr 9 12:04:47 2014 +0100

    configure: use do_cc when checking for -fstack-protector support
    
    MacOSX clang silently swallows unrecognized -f options when doing a link
    with '-framework' also on the command line, so to detect support for
    the various -fstack-protector options we must do a plain .c to .o compile,
    not a complete compile-and-link.
    
    Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
    Reviewed-by: Michael S. Tsirkin <mst at redhat.com>
    Message-id: 1397041487-28477-1-git-send-email-peter.maydell at linaro.org

diff --git a/configure b/configure
index eb0e7bb..c85475f 100755
--- a/configure
+++ b/configure
@@ -1448,7 +1448,7 @@ done
 if test "$stack_protector" != "no" ; then
   gcc_flags="-fstack-protector-strong -fstack-protector-all"
   for flag in $gcc_flags; do
-    if compile_prog "-Werror $flag" "" ; then
+    if do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC ; then
       QEMU_CFLAGS="$QEMU_CFLAGS $flag"
       LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"
       break
commit 775478418a5244b28ce891e398e0232dc4e60b43
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Thu Apr 10 19:03:18 2014 +0300

    acpi: update generated hex files
    
    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 at redhat.com>

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,
commit 50329d3418c959ebce63c59d4c21473ac102d88f
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Wed Apr 9 17:47:07 2014 +0300

    tests/acpi: update expected DSDT files
    
    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 at redhat.com>
    Reported-by: Igor Mammedov <imammedo at redhat.com>

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index 8b14a5f..d0bb3de 100644
Binary files a/tests/acpi-test-data/pc/DSDT and b/tests/acpi-test-data/pc/DSDT differ
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index a76ea9a..fc5b970 100644
Binary files a/tests/acpi-test-data/q35/DSDT and b/tests/acpi-test-data/q35/DSDT differ