Commit 325a084c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-10-24-1' into staging 



Merge tpm 2017/10/24 v1

# gpg: Signature made Wed 25 Oct 2017 06:06:55 BST
# gpg:                using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# 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-2017-10-24-1:
  tpm: print buffers received from TPM when debugging
  vl: remove unnecessary #ifdef CONFIG_TPM
  tpm: remove unnecessary #ifdef CONFIG_TPM
  tpm: add stubs
  tpm: add missing include

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ae49fbbc 298d8b81

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1544,6 +1544,7 @@ TPM 
M: Stefan Berger <stefanb@linux.vnet.ibm.com>

S: Maintained

F: tpm.c

F: stubs/tpm.c

F: hw/tpm/*

F: include/hw/acpi/tpm.h

F: include/sysemu/tpm*

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ bt-host.o-cflags := $(BLUEZ_CFLAGS) 
common-obj-y += dma-helpers.o

common-obj-y += vl.o

vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

common-obj-y += tpm.o

common-obj-$(CONFIG_TPM) += tpm.o



common-obj-$(CONFIG_SLIRP) += slirp/

hw/tpm/tpm_tis.c

+2 −0
Original line number Diff line number Diff line
@@ -422,6 +422,8 @@ static void tpm_tis_receive_bh(void *opaque) 
    s->loc[locty].r_offset = 0;

    s->loc[locty].w_offset = 0;



    tpm_tis_show_buffer(&s->loc[locty].r_buffer, "tpm_tis: From TPM");



    if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) {

        tpm_tis_abort(s, locty);

    }

include/sysemu/tpm.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define QEMU_TPM_H



#include "qemu/option.h"

#include "qom/object.h"



typedef struct TPMState TPMState;

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ stub-obj-y += runstate-check.o 
stub-obj-y += set-fd-handler.o

stub-obj-y += slirp.o

stub-obj-y += sysbus.o

stub-obj-y += tpm.o

stub-obj-y += trace-control.o

stub-obj-y += uuid.o

stub-obj-y += vm-stop.o