Skip to content

tpm: Split hw/ vs backends/

Philippe Mathieu-Daudé qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest12 patches 3 repliesIn review
  2. v211 patches 5 repliesApplied
  3. v18 patches 13 repliesSuperseded

Changes in v3 from the cover letter

- Resolved the FIXME in tpm_tis_common.c by making the TRACE_TPM_UTIL_SHOW_BUFFER check locally to tpm_util.c

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/12docs/specs/tpm: Correct header path namedocs/specs/tpm.rst+1 -10 replies
2/12backends: Add TPM files into their own directoryMAINTAINERS backends/Makefile.objs backends/tpm/Makefile.objs +1 more+3 -20 replies
3/12hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfighw/tpm/Kconfig+6 -60 replies
4/12hw/tpm: Do not include 'qemu/osdep.h' in headerhw/tpm/tpm_tis.h+0 -10 replies
5/12hw/tpm: Include missing 'qemu/option.h' headerhw/tpm/tpm_int.h+2 -00 replies
6/12hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sourceshw/tpm/tpm_ppi.c hw/tpm/tpm_ppi.h hw/tpm/tpm_tis_isa.c +1 more+3 -10 replies
7/12hw/tpm: Remove unnecessary 'tpm_int.h' header inclusionhw/tpm/tpm_crb.c hw/tpm/tpm_spapr.c hw/tpm/tpm_tis_common.c+0 -30 replies
8/12hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.chw/tpm/tpm_tis_common.c hw/tpm/tpm_util.c+5 -61 reply
9/12hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h'hw/tpm/tpm_int.h hw/tpm/tpm_util.h+11 -100 replies
10/12hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local headerhw/tpm/tpm_crb.c hw/tpm/tpm_prop.h hw/tpm/tpm_spapr.c +3 more+35 -50 replies
11/12hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"docs/specs/tpm.rst hw/tpm/tpm_crb.c hw/tpm/tpm_emulator.c +5 more+11 -110 replies
12/12tpm: Move backend code under the 'backends/' directoryMakefile Makefile.objs backends/Kconfig +13 more+62 -600 replies

Reviews trailers per patch

11 of 12 patches have a Reviewed-by or Acked-by.

PatchStefan Berger
1/12R-b
2/12R-b
3/12R-b
4/12R-b
5/12R-b
6/12R-b
7/12R-b
8/12R-b
9/12R-b
10/12R-b
11/12R-b
12/12

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 00/12] tpm: Split hw/ vs backends/

Missing review: last patch
- #12 "tpm: Move backend code under the 'backends/' directory"

Hi,

Yesterday I started to review some vTPM patches and got very confused by the files under hw/tpm/. In particular after running:

  $ git grep TYPE_TPM_BACKEND
  backends/tpm.c:188:    .name = TYPE_TPM_BACKEND,
  hw/tpm/tpm_emulator.c:985:    .parent = TYPE_TPM_BACKEND,
  hw/tpm/tpm_passthrough.c:393:    .parent = TYPE_TPM_BACKEND,
  include/sysemu/tpm_backend.h:21:#define TYPE_TPM_BACKEND "tpm-backend"

As there is no particular reason to keep this mixed, clean it up.

Since v2:
- Resolved the FIXME in tpm_tis_common.c by making the TRACE_TPM_UTIL_SHOW_BUFFER check locally to tpm_util.c

Since v1:
- Amended docs/ changes
- Renamed Kconfig TPM_BACKEND variable
- Move backend files under backends/tpm/ (Marc-André & Stefan)
- Fix x86-64 build error (patchew)

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

 docs/specs/tpm.rst                     | 14 +++++------
 Makefile                               |  2 +-
 Makefile.objs                          |  1 +
 {hw => backends}/tpm/tpm_int.h         | 19 +++++++++++---
 {hw => backends}/tpm/tpm_ioctl.h       |  0
 hw/tpm/tpm_ppi.h                       |  1 -
 hw/tpm/tpm_prop.h                      | 31 +++++++++++++++++++++++
 hw/tpm/tpm_tis.h                       |  1 -
 {hw/tpm => include/sysemu}/tpm_util.h  | 19 +++-----------
 backends/{tpm.c => tpm/tpm_backend.c}  |  0
 {hw => backends}/tpm/tpm_emulator.c    |  2 +-
 {hw => backends}/tpm/tpm_passthrough.c |  2 +-
 {hw => backends}/tpm/tpm_util.c        |  5 +++-
 hw/tpm/tpm_crb.c                       |  4 +--
 hw/tpm/tpm_ppi.c                       |  1 +
 hw/tpm/tpm_spapr.c                     |  4 +--
 hw/tpm/tpm_tis_common.c                | 11 +++------
 hw/tpm/tpm_tis_isa.c                   |  3 ++-
 hw/tpm/tpm_tis_sysbus.c                |  3 ++-
 tests/qtest/tpm-emu.c                  |  2 +-
 MAINTAINERS                            |  2 +-
 backends/Kconfig                       |  1 +
 backends/Makefile.objs                 |  2 +-
 backends/tpm/Kconfig                   | 14 +++++++++++
 backends/tpm/Makefile.objs             |  4 +++
 backends/tpm/trace-events              | 33 +++++++++++++++++++++++++
 hw/tpm/Kconfig                         | 21 +++-------------
 hw/tpm/Makefile.objs                   |  3 ---
 hw/tpm/trace-events                    | 34 +-------------------------
 29 files changed, 136 insertions(+), 103 deletions(-)
 rename {hw => backends}/tpm/tpm_int.h (81%)
 rename {hw => backends}/tpm/tpm_ioctl.h (100%)
 create mode 100644 hw/tpm/tpm_prop.h
 rename {hw/tpm => include/sysemu}/tpm_util.h (80%)
 rename backends/{tpm.c => tpm/tpm_backend.c} (100%)
 rename {hw => backends}/tpm/tpm_emulator.c (99%)
 rename {hw => backends}/tpm/tpm_passthrough.c (99%)
 rename {hw => backends}/tpm/tpm_util.c (98%)
 create mode 100644 backends/Kconfig
 create mode 100644 backends/tpm/Kconfig
 create mode 100644 backends/tpm/Makefile.objs
 create mode 100644 backends/tpm/trace-events
Signature · 1 line
2.21.3