Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-03-07-1' into...

Merge tpm 2018/03/07

# gpg: Signature made Wed 07 Mar 2018 12:42:13 GMT
# gpg:                using RSA key 75AD65802A0B4211
# 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-2018-03-07-1:
  tpm: convert tpm_tis.c to use trace-events
  tpm: convert tpm_emulator.c to use trace-events
  tpm: convert tpm_util.c to use trace-events
  tpm: convert tpm_passthrough.c to use trace-events
  tpm: convert tpm_crb.c to use trace-events

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

diff --cc Makefile.objs
Simple merge

diff --cc hw/tpm/tpm_emulator.c
index f187a72c101597b0250429110118efaf9e8a14cc,d0da10a1a6adc2cef5c027517abc7a52ccc97bc9..6418ef08310f401de5fea9c429a4c97bfd21e41f
--- 1/hw/tpm/tpm_emulator.c
--- 2/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@@ -38,16 -38,8 +38,9 @@@
  #include "migration/blocker.h"
  #include "qapi/error.h"
  #include "qapi/clone-visitor.h"
 +#include "qapi/qapi-visit-tpm.h"
  #include "chardev/char-fe.h"
- 
- #define DEBUG_TPM 0
- 
- #define DPRINTF(fmt, ...) do { \
-     if (DEBUG_TPM) { \
-         fprintf(stderr, "tpm-emulator:"fmt"\n", ## __VA_ARGS__); \
-     } \
- } while (0)
+ #include "trace.h"
  
  #define TYPE_TPM_EMULATOR "tpm-emulator"
  #define TPM_EMULATOR(obj) \

diff --cc hw/tpm/tpm_passthrough.c
index 211df3191c96a2e79fc4326067848832d0de318a,2589c4de7610a37d8c144d54a5d76ee828b007b4..479317ee508b2d5a67e92de1fd03c7860490232b
--- 1/hw/tpm/tpm_passthrough.c
--- 2/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@@ -30,16 -30,8 +30,9 @@@
  #include "tpm_int.h"
  #include "hw/hw.h"
  #include "qapi/clone-visitor.h"
 +#include "qapi/qapi-visit-tpm.h"
  #include "tpm_util.h"
- 
- #define DEBUG_TPM 0
- 
- #define DPRINTF(fmt, ...) do { \
-     if (DEBUG_TPM) { \
-         fprintf(stderr, fmt, ## __VA_ARGS__); \
-     } \
- } while (0)
+ #include "trace.h"
  
  #define TYPE_TPM_PASSTHROUGH "tpm-passthrough"
  #define TPM_PASSTHROUGH(obj) \