diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-26 09:20:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-26 09:20:11 +0100 |
| commit | 325a084c1ebccb265a3c8f1dd092ffbbfb448a00 (patch) | |
| tree | cb94a661c36efc359ba4147d7d93493e4b3ca955 /include | |
| parent | ae49fbbcd8e4e9d8bf7131add34773f579e1aff7 (diff) | |
| parent | 298d8b81d45d2297f88d93604bd5eebfd653d6cf (diff) | |
| download | qemu-325a084c1ebccb265a3c8f1dd092ffbbfb448a00.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-10-24-1' into staging
Merge tpm 2017/10/24 v1
# gpg: Signature made Wed 25 Oct 2017 06:06:55 BST
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2017-10-24-1:
tpm: print buffers received from TPM when debugging
vl: remove unnecessary #ifdef CONFIG_TPM
tpm: remove unnecessary #ifdef CONFIG_TPM
tpm: add stubs
tpm: add missing include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/tpm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index c8afa179e5..d7a2bd8556 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -13,6 +13,7 @@ #define QEMU_TPM_H #include "qemu/option.h" +#include "qom/object.h" typedef struct TPMState TPMState; |