diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-25 18:49:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-25 18:49:25 +0100 |
| commit | a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1 (patch) | |
| tree | cb3321d309b92bd15082518574ede30aa18010bc /hw/i386/acpi-defs.h | |
| parent | 3dd359c2d34c6abf385d58da863f337b39702585 (diff) | |
| parent | 187de915e8d06aaf82be206aebc551c82bf0670c (diff) | |
| download | focaccia-qemu-a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1.tar.gz focaccia-qemu-a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, pc fixes, features A bunch of bugfixes - these will make sense for 2.1.1 ACPI support for TPM and partial ARI support for PCIE. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Sun 24 Aug 2014 23:16:35 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: pcie: fix trailing whitespace ioh3420: Enable ARI forwarding ioh3420: Remove obsoleted, unused ioh3420_init function pcie: Rename the pcie_cap_ari_* functions to pcie_cap_arifwd_* pcie: Fix incorrect write to the ari capability next function field ssdt-tpm: add generated hex file to git Add ACPI tables for TPM pc: reserve more memory for ACPI for new machine types pcihp: fix possible array out of bounds pci_bridge: manually destroy memory regions within PCIBridgeWindows hostmem: set MPOL_MF_MOVE Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/acpi-defs.h')
| -rw-r--r-- | hw/i386/acpi-defs.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h index e93babb026..1bc974a363 100644 --- a/hw/i386/acpi-defs.h +++ b/hw/i386/acpi-defs.h @@ -314,4 +314,15 @@ struct AcpiTableMcfg { } QEMU_PACKED; typedef struct AcpiTableMcfg AcpiTableMcfg; +/* + * TCPA Description Table + */ +struct Acpi20Tcpa { + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + uint16_t platform_class; + uint32_t log_area_minimum_length; + uint64_t log_area_start_address; +} QEMU_PACKED; +typedef struct Acpi20Tcpa Acpi20Tcpa; + #endif |