From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Stefan Berger <stefanb@linux.vnet.ibm.com>
Subject: [PULL v1 00/12] Merge tpm 2020/06/23 v1
Date: Tue, 23 Jun 2020 07:41:02 -0400 [thread overview]
Message-ID: <20200623114114.1375104-1-stefanb@linux.vnet.ibm.com> (raw)
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%)
--
2.24.1
next reply other threads:[~2020-06-23 11:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 11:41 Stefan Berger [this message]
2020-06-23 11:41 ` [PULL v1 01/12] docs/specs/tpm: Correct header path name Stefan Berger
2020-06-23 11:41 ` [PULL v1 02/12] backends: Add TPM files into their own directory Stefan Berger
2020-06-23 11:41 ` [PULL v1 03/12] hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig Stefan Berger
2020-06-23 11:41 ` [PULL v1 04/12] hw/tpm: Do not include 'qemu/osdep.h' in header Stefan Berger
2020-06-23 11:41 ` [PULL v1 05/12] hw/tpm: Include missing 'qemu/option.h' header Stefan Berger
2020-06-23 11:41 ` [PULL v1 06/12] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources Stefan Berger
2020-06-23 11:41 ` [PULL v1 07/12] hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion Stefan Berger
2020-06-23 11:41 ` [PULL v1 08/12] hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c Stefan Berger
2020-06-23 11:41 ` [PULL v1 09/12] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h' Stefan Berger
2020-06-23 11:41 ` [PULL v1 10/12] hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header Stefan Berger
2020-06-23 11:41 ` [PULL v1 11/12] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h" Stefan Berger
2020-06-23 11:41 ` [PULL v1 12/12] tpm: Move backend code under the 'backends/' directory Stefan Berger
2020-06-25 8:34 ` [PULL v1 00/12] Merge tpm 2020/06/23 v1 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623114114.1375104-1-stefanb@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).