[Qemu-commits] [qemu/qemu] 9e4722: acpi: add missing ssdt

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9e472263b07d53cb3401ee49ef1b45ef195ddb84
      
https://github.com/qemu/qemu/commit/9e472263b07d53cb3401ee49ef1b45ef195ddb84
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    A hw/i386/ssdt-tpm-common.dsl

  Log Message:
  -----------
  acpi: add missing ssdt

commit 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab
    TPM2 ACPI table support

was missing a file, so build with iasl fails
(build without iasl works since it uses the generated
 hex files).

Reported-by: "Daniel P. Berrange" <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: ef99b3ee065d5c817fa0a50d95293e569bfb47fb
      
https://github.com/qemu/qemu/commit/ef99b3ee065d5c817fa0a50d95293e569bfb47fb
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    A hw/i386/ssdt-tpm-common.dsl

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc build fix

My last pull breaks build on systems with iasl.
Fix this up.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon Jun  1 20:41:08 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  acpi: add missing ssdt

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b821cbe274c5...ef99b3ee065d