mbox

[PULL,v2,0/6] Merge tpm 2018/01/26

Message ID 1517264719-18288-1-git-send-email-stefanb@linux.vnet.ibm.com
State New
Headers show

Pull-request

git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2018-01-26-2

Message

Stefan Berger Jan. 29, 2018, 10:25 p.m. UTC 
The patches in this pull request fix a bug in the initialization of
a variable, adapt the cancel path used by the passthrough device to the
sysfs path of more recent versions of the Linux kernel, and do some other
cleanups preparing for support of migration. Finally, we add the CRB
interface emulation, which is used with a TPM 2.

The following changes since commit 0d1442912b3d6591a57ee45fbf28bc91e58d9e76:

  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2018-01-29 14:29:17 +0000)

are available in the git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2018-01-26-2

for you to fetch changes up to 4ab6cb4c62273bb46102e5ae1d6af691b47cbcd8:

  tpm: add CRB device (2018-01-29 14:22:50 -0500)

----------------------------------------------------------------
Merge tpm 2018/01/26 v2

----------------------------------------------------------------
Marc-André Lureau (5):
      tpm: fix alignment issues
      tpm: lookup cancel path under tpm device class
      tpm: replace GThreadPool with AIO threadpool
      tpm: report backend request error
      tpm: add CRB device

Stefan Berger (1):
      tpm: Set the flags of the CMD_INIT command to 0

 backends/tpm.c                     |  59 +++++++++--------
 default-configs/i386-softmmu.mak   |   1 +
 default-configs/x86_64-softmmu.mak |   1 +
 hw/i386/acpi-build.c               |  34 +++++++---
 hw/tpm/Makefile.objs               |   1 +
 hw/tpm/tpm_crb.c                   | 303 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/tpm/tpm_emulator.c              |  39 +++++-------
 hw/tpm/tpm_passthrough.c           |  71 +++++++++++----------
 hw/tpm/tpm_tis.c                   |   3 +-
 hw/tpm/tpm_util.c                  |  75 ++++++++++------------
 hw/tpm/tpm_util.h                  |  17 ++++-
 include/hw/acpi/tpm.h              |  51 +++++++++++++++
 include/sysemu/tpm.h               |   5 +-
 include/sysemu/tpm_backend.h       |  15 ++++-
 qapi/tpm.json                      |   5 +-
 tests/Makefile.include             |   2 +
 tests/tpm-crb-test.c               | 275 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 17 files changed, 818 insertions(+), 139 deletions(-)
 create mode 100644 hw/tpm/tpm_crb.c
 create mode 100644 tests/tpm-crb-test.c

Comments

Peter Maydell Jan. 30, 2018, 4:53 p.m. UTC | #1 
On 29 January 2018 at 22:25, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
> The patches in this pull request fix a bug in the initialization of
> a variable, adapt the cancel path used by the passthrough device to the
> sysfs path of more recent versions of the Linux kernel, and do some other
> cleanups preparing for support of migration. Finally, we add the CRB
> interface emulation, which is used with a TPM 2.
>
> The following changes since commit 0d1442912b3d6591a57ee45fbf28bc91e58d9e76:
>
>   Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2018-01-29 14:29:17 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2018-01-26-2
>
> for you to fetch changes up to 4ab6cb4c62273bb46102e5ae1d6af691b47cbcd8:
>
>   tpm: add CRB device (2018-01-29 14:22:50 -0500)
>
> ----------------------------------------------------------------
> Merge tpm 2018/01/26 v2
>

Applied, thanks.

-- PMM