Re: [PATCH 0/8] tpm: Split hw/ vs backends/

[Philippe Mathieu-Daudé]

On 6/10/20 10:09 PM, Marc-André Lureau wrote:
> Hi
> 
> On Thu, Jun 11, 2020 at 12:03 AM Philippe Mathieu-Daudé
> <philmd@redhat.com <mailto:philmd@redhat.com>> wrote:
> 
>     Hi,
> 
>     Today 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.
> 
> 
> While at it, why not start to organize backends/ ?  I would move that
> under backends/tpm/

Sure, if the overall of this series looks good, I can do that.
I'll wait for positive/negative feedback first.

> 
> 
>     Philippe Mathieu-Daudé (8):
>       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: 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
> 
>      Makefile                               |  2 +-
>      {hw/tpm => backends}/tpm_int.h         | 19 +++++++++++---
>      {hw/tpm => backends}/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 +++-----------
>      {hw/tpm => backends}/tpm_emulator.c    |  2 +-
>      {hw/tpm => backends}/tpm_passthrough.c |  2 +-
>      {hw/tpm => backends}/tpm_util.c        |  2 +-
>      hw/tpm/tpm_crb.c                       |  4 +--
>      hw/tpm/tpm_spapr.c                     |  4 +--
>      hw/tpm/tpm_tis_common.c                |  4 +--
>      hw/tpm/tpm_tis_isa.c                   |  3 ++-
>      hw/tpm/tpm_tis_sysbus.c                |  3 ++-
>      tests/qtest/tpm-emu.c                  |  2 +-
>      MAINTAINERS                            |  2 +-
>      backends/Kconfig                       | 14 +++++++++++
>      backends/Makefile.objs                 |  3 +++
>      backends/trace-events                  | 32 ++++++++++++++++++++++++
>      hw/tpm/Kconfig                         | 15 ------------
>      hw/tpm/Makefile.objs                   |  3 ---
>      hw/tpm/trace-events                    | 34 +-------------------------
>      23 files changed, 116 insertions(+), 86 deletions(-)
>      rename {hw/tpm => backends}/tpm_int.h (81%)
>      rename {hw/tpm => backends}/tpm_ioctl.h (100%)
>      create mode 100644 hw/tpm/tpm_prop.h
>      rename {hw/tpm => include/sysemu}/tpm_util.h (80%)
>      rename {hw/tpm => backends}/tpm_emulator.c (99%)
>      rename {hw/tpm => backends}/tpm_passthrough.c (99%)
>      rename {hw/tpm => backends}/tpm_util.c (99%)
>      create mode 100644 backends/Kconfig
> 
>     -- 
>     2.21.3
> 
> 
> 
> 
> -- 
> Marc-André Lureau