diff options
| author | Peter Maydell | 2014-08-25 19:49:25 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-08-25 19:49:25 +0200 |
| commit | a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1 (patch) | |
| tree | cb3321d309b92bd15082518574ede30aa18010bc /include/sysemu/tpm.h | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-08-24' in... (diff) | |
| parent | pcie: fix trailing whitespace (diff) | |
| download | qemu-a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1.tar.gz qemu-a44a12b78a7e9a3dc59e5b10b09a0bc934c693f1.tar.xz 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 'include/sysemu/tpm.h')
| -rw-r--r-- | include/sysemu/tpm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index 13febddbee..9b81ce9189 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -20,4 +20,11 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_init(void); void tpm_cleanup(void); +#define TYPE_TPM_TIS "tpm-tis" + +static inline bool tpm_find(void) +{ + return object_resolve_path_type("", TYPE_TPM_TIS, NULL); +} + #endif /* QEMU_TPM_H */ |