The following changes since commit d147f7e815f97cb477e223586bcb80c316ae10ea:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-10-03 16:27:24 +0100) are available in the git repository at: git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2017-10-04-1 for you to fetch changes up to 5e64d0182fe9d1c9caa347c5bee0a0591f9be2ef: specs: Describe the TPM support in QEMU (2017-10-05 12:39:15 -0400) ---------------------------------------------------------------- Merge tpm 2017/10/04 v1 ---------------------------------------------------------------- Amarnath Valluri (9): tpm-backend: Remove unneeded member variable from backend class tpm-backend: Move thread handling inside TPMBackend tpm-backend: Initialize and free data members in it's own methods tpm-backend: Made few interface methods optional tpm-backend: Add new API to read backend TpmInfo tpm-backend: Move realloc_buffer() implementation to tpm-tis model tpm-passthrough: move reusable code to utils tpm: Added support for TPM emulator tpm: Move tpm_cleanup() to right place Stefan Berger (1): specs: Describe the TPM support in QEMU backends/tpm.c | 115 ++++++++------ configure | 13 +- docs/specs/tpm.txt | 123 +++++++++++++++ hmp.c | 5 + hw/tpm/Makefile.objs | 1 + hw/tpm/tpm_emulator.c | 587 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/tpm/tpm_ioctl.h | 246 ++++++++++++++++++++++++++++++ hw/tpm/tpm_passthrough.c | 242 +++++++----------------------- hw/tpm/tpm_tis.c | 14 +- hw/tpm/tpm_util.c | 25 ++++ hw/tpm/tpm_util.h | 4 + include/sysemu/tpm_backend.h | 80 +++++----- include/sysemu/tpm_backend_int.h | 41 ----- qapi/tpm.json | 21 ++- qemu-options.hx | 22 ++- tpm.c | 37 +---- vl.c | 1 + 17 files changed, 1211 insertions(+), 366 deletions(-) create mode 100644 docs/specs/tpm.txt create mode 100644 hw/tpm/tpm_emulator.c create mode 100644 hw/tpm/tpm_ioctl.h delete mode 100644 include/sysemu/tpm_backend_int.h -- 2.5.5