[Qemu-commits] [qemu/qemu] 8a5fee: docs/specs/tpm: Correct header path name

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8a5fee0325f5627adf0f0e171083d512351d3acc
      
https://github.com/qemu/qemu/commit/8a5fee0325f5627adf0f0e171083d512351d3acc
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M docs/specs/tpm.rst

  Log Message:
  -----------
  docs/specs/tpm: Correct header path name

Commit 8dc6701722 introduce the documentation but an
incorrect path name was used. Fix that.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-2-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 8ae92e2418c85755992ac306f8d57769275fa0b6
      
https://github.com/qemu/qemu/commit/8ae92e2418c85755992ac306f8d57769275fa0b6
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M MAINTAINERS
    M backends/Makefile.objs
    R backends/tpm.c
    A backends/tpm/Makefile.objs
    A backends/tpm/tpm_backend.c

  Log Message:
  -----------
  backends: Add TPM files into their own directory

As we will have various TPM backend files, it is cleaner
to use a single directory.

Suggested-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-3-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 81c7aa03e956dc5796aac9d93bff08df2eee1607
      
https://github.com/qemu/qemu/commit/81c7aa03e956dc5796aac9d93bff08df2eee1607
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/Kconfig

  Log Message:
  -----------
  hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig

The TPMDEV describe TPM backends. Use the TPM_BACKEND config
name which is self-explicit.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-4-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 29ce02bfb9fc79fec151dd450f54655e9aff2c50
      
https://github.com/qemu/qemu/commit/29ce02bfb9fc79fec151dd450f54655e9aff2c50
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_tis.h

  Log Message:
  -----------
  hw/tpm: Do not include 'qemu/osdep.h' in header

>From CODING_STYLE.rst:

  Do not include "qemu/osdep.h" from header files since the .c
  file will have already included it.

Remove "qemu/osdep.h" from "tpm_tis.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-5-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: ae9604013094fffe4d65d03874881f0a58a72167
      
https://github.com/qemu/qemu/commit/ae9604013094fffe4d65d03874881f0a58a72167
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_int.h

  Log Message:
  -----------
  hw/tpm: Include missing 'qemu/option.h' header

Files using the TPM_STANDARD_CMDLINE_OPTS macro declared in
"tpm_int.h" will use QEMU_OPT_STRING definition declared in
"qemu/option.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-6-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 4021476605228eb4c1c0ddb16780fdfab75306e5
      
https://github.com/qemu/qemu/commit/4021476605228eb4c1c0ddb16780fdfab75306e5
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_ppi.c
    M hw/tpm/tpm_ppi.h
    M hw/tpm/tpm_tis_isa.c
    M hw/tpm/tpm_tis_sysbus.c

  Log Message:
  -----------
  hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources

Nothing in "tpm_ppi.h" require declarations from "hw/acpi/tpm.h".
Reduce dependencies and include it only in the files requiring it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-7-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 680725651799e4f1c74a29b6fc5813708c786747
      
https://github.com/qemu/qemu/commit/680725651799e4f1c74a29b6fc5813708c786747
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_crb.c
    M hw/tpm/tpm_spapr.c
    M hw/tpm/tpm_tis_common.c

  Log Message:
  -----------
  hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion

Remove unnecessary 'tpm_int.h' header inclusion.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-8-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: f670a562af4bd6ef9adee7654cf5129f14a277a8
      
https://github.com/qemu/qemu/commit/f670a562af4bd6ef9adee7654cf5129f14a277a8
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_tis_common.c
    M hw/tpm/tpm_util.c

  Log Message:
  -----------
  hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c

The trace_event_get_state_backends() call is useful to avoid
making extensive calls (usually preparing arguments passed to
the tracing framework. In this case, the extensive work is
done in tpm_util_show_buffer(), and the arguments used to
call it don't involve extra processing. Simplify by moving
the TRACE_TPM_UTIL_SHOW_BUFFER check to tpm_util_show_buffer.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-9-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: eccc0b0f022e2b19efee5daa1ae448f762cf748f
      
https://github.com/qemu/qemu/commit/eccc0b0f022e2b19efee5daa1ae448f762cf748f
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_int.h
    M hw/tpm/tpm_util.h

  Log Message:
  -----------
  hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h'

We are going to make "tpm_util.h" publicly accessible by
moving it to the include/ directory in a pair of commits.
Keep declarations internals to hw/tpm/ in "tpm_int.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-10-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: a3500613bdf13c7583e292a6de835b8cbfc1e8ca
      
https://github.com/qemu/qemu/commit/a3500613bdf13c7583e292a6de835b8cbfc1e8ca
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M hw/tpm/tpm_crb.c
    A hw/tpm/tpm_prop.h
    M hw/tpm/tpm_spapr.c
    M hw/tpm/tpm_tis_isa.c
    M hw/tpm/tpm_tis_sysbus.c
    M hw/tpm/tpm_util.h

  Log Message:
  -----------
  hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header

We are going to make "tpm_util.h" publicly accessible by
moving it to the include/ directory in the next commit.
The DEFINE_PROP_TPMBE() macro is only meaningful for the
TPM hardware files (in hw/tpm/), so keep this macro in a
local header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-11-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 0f7d2148201932c6a02b310543b1e50503a0ab2d
      
https://github.com/qemu/qemu/commit/0f7d2148201932c6a02b310543b1e50503a0ab2d
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M docs/specs/tpm.rst
    M hw/tpm/tpm_crb.c
    M hw/tpm/tpm_emulator.c
    M hw/tpm/tpm_passthrough.c
    M hw/tpm/tpm_spapr.c
    M hw/tpm/tpm_tis_common.c
    M hw/tpm/tpm_util.c
    R hw/tpm/tpm_util.h
    A include/sysemu/tpm_util.h

  Log Message:
  -----------
  hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"

We are going to split the TPM backends from the TPM emulated
hardware in the next commit. Make the TPM util helpers accessible
by moving local "tpm_util.h" to global "sysemu/tpm_util.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-12-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: ca64b08638e259c313a3e7c3da106116b59be8e9
      
https://github.com/qemu/qemu/commit/ca64b08638e259c313a3e7c3da106116b59be8e9
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-19 (Fri, 19 Jun 2020)

  Changed paths:
    M Makefile
    M Makefile.objs
    A backends/Kconfig
    A backends/tpm/Kconfig
    M backends/tpm/Makefile.objs
    A backends/tpm/tpm_emulator.c
    A backends/tpm/tpm_int.h
    A backends/tpm/tpm_ioctl.h
    A backends/tpm/tpm_passthrough.c
    A backends/tpm/tpm_util.c
    A backends/tpm/trace-events
    M docs/specs/tpm.rst
    M hw/tpm/Kconfig
    M hw/tpm/Makefile.objs
    R hw/tpm/tpm_emulator.c
    R hw/tpm/tpm_int.h
    R hw/tpm/tpm_ioctl.h
    R hw/tpm/tpm_passthrough.c
    R hw/tpm/tpm_util.c
    M hw/tpm/trace-events
    M tests/qtest/tpm-emu.c

  Log Message:
  -----------
  tpm: Move backend code under the 'backends/' directory

TPM subsytem is split into backends (see commit f4ede81eed2)
and frontends (see i.e. 3676bc69b35). Keep the emulated
hardware 'frontends' under hw/tpm/, but move the backends
in the backends/tpm/ directory.

Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200612085444.8362-13-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


  Commit: 27c77b1f55323fae772699e05cd5107aa32f9e9a
      
https://github.com/qemu/qemu/commit/27c77b1f55323fae772699e05cd5107aa32f9e9a
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-06-24 (Wed, 24 Jun 2020)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M Makefile.objs
    A backends/Kconfig
    M backends/Makefile.objs
    R backends/tpm.c
    A backends/tpm/Kconfig
    A backends/tpm/Makefile.objs
    A backends/tpm/tpm_backend.c
    A backends/tpm/tpm_emulator.c
    A backends/tpm/tpm_int.h
    A backends/tpm/tpm_ioctl.h
    A backends/tpm/tpm_passthrough.c
    A backends/tpm/tpm_util.c
    A backends/tpm/trace-events
    M docs/specs/tpm.rst
    M hw/tpm/Kconfig
    M hw/tpm/Makefile.objs
    M hw/tpm/tpm_crb.c
    R hw/tpm/tpm_emulator.c
    R hw/tpm/tpm_int.h
    R hw/tpm/tpm_ioctl.h
    R hw/tpm/tpm_passthrough.c
    M hw/tpm/tpm_ppi.c
    M hw/tpm/tpm_ppi.h
    A hw/tpm/tpm_prop.h
    M hw/tpm/tpm_spapr.c
    M hw/tpm/tpm_tis.h
    M hw/tpm/tpm_tis_common.c
    M hw/tpm/tpm_tis_isa.c
    M hw/tpm/tpm_tis_sysbus.c
    R hw/tpm/tpm_util.c
    R hw/tpm/tpm_util.h
    M hw/tpm/trace-events
    A include/sysemu/tpm_util.h
    M tests/qtest/tpm-emu.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stefanberger/tags/pull-tpm-2020-06-23-1' into staging

Merge tpm 2020/06/23 v1

# gpg: Signature made Tue 23 Jun 2020 12:35:03 BST
# gpg:                using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" 
[unknown]
# 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-2020-06-23-1:
  tpm: Move backend code under the 'backends/' directory
  hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"
  hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header
  hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h'
  hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c
  hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion
  hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources
  hw/tpm: Include missing 'qemu/option.h' header
  hw/tpm: Do not include 'qemu/osdep.h' in header
  hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig
  backends: Add TPM files into their own directory
  docs/specs/tpm: Correct header path name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/d4b78317b7cf...27c77b1f5532