[Qemu-devel] [PULL fixup] pc build fix

[Qemu-devel] [PULL fixup] pc build fix

[Michael S. Tsirkin]

The following changes since commit 830d70db692e374b55555f4407f96a1ceefdcc97:

  vhost-user: add multi queue support (2015-06-01 14:18:55 +0200)

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 9e472263b07d53cb3401ee49ef1b45ef195ddb84:

  acpi: add missing ssdt (2015-06-01 21:40:22 +0200)

----------------------------------------------------------------
pc build fix

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

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

----------------------------------------------------------------
Michael S. Tsirkin (1):
      acpi: add missing ssdt

 hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 hw/i386/ssdt-tpm-common.dsl

[Qemu-devel] [PULL fixup] acpi: add missing ssdt

[Michael S. Tsirkin]

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" <berrange@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 hw/i386/ssdt-tpm-common.dsl

diff --git a/hw/i386/ssdt-tpm-common.dsl b/hw/i386/ssdt-tpm-common.dsl
new file mode 100644
index 0000000..9da4970
--- /dev/null
+++ b/hw/i386/ssdt-tpm-common.dsl
@@ -0,0 +1,36 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Common parts for TPM 1.2 and TPM 2 (with slight differences for PPI)
+ * to be #included
+ */
+
+
+    External(\_SB.PCI0.ISA, DeviceObj)
+    Scope(\_SB.PCI0.ISA) {
+        /* TPM with emulated TPM TIS interface */
+        Device (TPM) {
+            Name (_HID, EisaID ("PNP0C31"))
+            Name (_CRS, ResourceTemplate ()
+            {
+                Memory32Fixed (ReadWrite, TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE)
+                IRQNoFlags () {TPM_TIS_IRQ}
+            })
+            Method (_STA, 0, NotSerialized) {
+                Return (0x0F)
+            }
+        }
+    }
-- 
MST

Re: [Qemu-devel] [PULL fixup] acpi: add missing ssdt

[Daniel P. Berrange]

On Mon, Jun 01, 2015 at 09:42:10PM +0200, Michael S. Tsirkin wrote:
> 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" <berrange@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Tested-by: Daniel P. Berrange <berrange@redhat.com>

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PULL fixup] pc build fix

[Peter Maydell]

On 1 June 2015 at 20:42, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 830d70db692e374b55555f4407f96a1ceefdcc97:
>
>   vhost-user: add multi queue support (2015-06-01 14:18:55 +0200)
>
> 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 9e472263b07d53cb3401ee49ef1b45ef195ddb84:
>
>   acpi: add missing ssdt (2015-06-01 21:40:22 +0200)
>
> ----------------------------------------------------------------
> pc build fix
>
> My last pull breaks build on systems with iasl.
> Fix this up.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Michael S. Tsirkin (1):
>       acpi: add missing ssdt
>
>  hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 hw/i386/ssdt-tpm-common.dsl

Applied, thanks.

-- PMM