| Message ID | 20200623114114.1375104-1-stefanb@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 23 Jun 2020 at 12:41, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > > This PR cleans up header includes in TPM code and moves some backend components > into backends/tpm. > > The following changes since commit 292ef18a38270e1cb8e9a3dc06bca589068f293d: > > Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2020-06-18 16:52:10 +0100) > > are available in the Git repository at: > > git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2020-06-23-1 > > for you to fetch changes up to ca64b08638e259c313a3e7c3da106116b59be8e9: > > tpm: Move backend code under the 'backends/' directory (2020-06-19 07:25:55 -0400) > > ---------------------------------------------------------------- > Merge tpm 2020/06/23 v1 Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1 for any user-visible changes. -- PMM
This PR cleans up header includes in TPM code and moves some backend components into backends/tpm. The following changes since commit 292ef18a38270e1cb8e9a3dc06bca589068f293d: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2020-06-18 16:52:10 +0100) are available in the Git repository at: git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2020-06-23-1 for you to fetch changes up to ca64b08638e259c313a3e7c3da106116b59be8e9: tpm: Move backend code under the 'backends/' directory (2020-06-19 07:25:55 -0400) ---------------------------------------------------------------- Merge tpm 2020/06/23 v1 ---------------------------------------------------------------- Philippe Mathieu-Daudé (12): docs/specs/tpm: Correct header path name backends: Add TPM files into their own directory hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig hw/tpm: Do not include 'qemu/osdep.h' in header hw/tpm: Include missing 'qemu/option.h' header hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h' hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h" tpm: Move backend code under the 'backends/' directory MAINTAINERS | 2 +- Makefile | 2 +- Makefile.objs | 1 + backends/Kconfig | 1 + backends/Makefile.objs | 2 +- backends/tpm/Kconfig | 14 ++++++++++++++ backends/tpm/Makefile.objs | 4 ++++ backends/{tpm.c => tpm/tpm_backend.c} | 0 {hw => backends}/tpm/tpm_emulator.c | 2 +- {hw => backends}/tpm/tpm_int.h | 19 ++++++++++++++++--- {hw => backends}/tpm/tpm_ioctl.h | 0 {hw => backends}/tpm/tpm_passthrough.c | 2 +- {hw => backends}/tpm/tpm_util.c | 5 ++++- backends/tpm/trace-events | 33 +++++++++++++++++++++++++++++++++ docs/specs/tpm.rst | 14 +++++++------- hw/tpm/Kconfig | 21 +++------------------ hw/tpm/Makefile.objs | 3 --- hw/tpm/tpm_crb.c | 4 ++-- hw/tpm/tpm_ppi.c | 1 + hw/tpm/tpm_ppi.h | 1 - hw/tpm/tpm_prop.h | 31 +++++++++++++++++++++++++++++++ hw/tpm/tpm_spapr.c | 4 ++-- hw/tpm/tpm_tis.h | 1 - hw/tpm/tpm_tis_common.c | 11 +++-------- hw/tpm/tpm_tis_isa.c | 3 ++- hw/tpm/tpm_tis_sysbus.c | 3 ++- hw/tpm/trace-events | 34 +--------------------------------- {hw/tpm => include/sysemu}/tpm_util.h | 19 +++---------------- tests/qtest/tpm-emu.c | 2 +- 29 files changed, 136 insertions(+), 103 deletions(-) create mode 100644 backends/Kconfig create mode 100644 backends/tpm/Kconfig create mode 100644 backends/tpm/Makefile.objs rename backends/{tpm.c => tpm/tpm_backend.c} (100%) rename {hw => backends}/tpm/tpm_emulator.c (99%) rename {hw => backends}/tpm/tpm_int.h (81%) rename {hw => backends}/tpm/tpm_ioctl.h (100%) rename {hw => backends}/tpm/tpm_passthrough.c (99%) rename {hw => backends}/tpm/tpm_util.c (98%) create mode 100644 backends/tpm/trace-events create mode 100644 hw/tpm/tpm_prop.h rename {hw/tpm => include/sysemu}/tpm_util.h (80%)