diff options
| author | Roman Bolshakov <r.bolshakov@yadro.com> | 2020-12-07 09:43:52 +0300 |
|---|---|---|
| committer | Stefan Berger <stefanb@linux.vnet.ibm.com> | 2021-01-25 20:56:38 -0500 |
| commit | 68a5b02a4684e6f9bbe5113499f88c0018469d08 (patch) | |
| tree | a0ebcbd5250f7aa41df839711295eea739d89735 /hw/tpm | |
| parent | 31ee895047bdcf7387e3570cbd2a473c6f744b08 (diff) | |
| download | qemu-68a5b02a4684e6f9bbe5113499f88c0018469d08.zip qemu-68a5b02a4684e6f9bbe5113499f88c0018469d08.tar.gz qemu-68a5b02a4684e6f9bbe5113499f88c0018469d08.tar.bz2 | |
tpm: tpm_spapr: Remove unused tracepoint
Linking of qemu-system-ppc64 fails on macOS with dtrace enabled:
error: probe tpm_spapr_show_buffer doesn't exist
error: Could not register probes
ld: error creating dtrace DOF section for architecture x86_64
The failure is explained in 8c8ed03850208e4 ("net/colo: Match is-enabled
probe to tracepoint"). In short, is-enabled probe can't be used without
a matching trace probe. And for this particular case
tpm_util_show_buffer probe should be enabled to print TPM buffer.
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Diffstat (limited to 'hw/tpm')
| -rw-r--r-- | hw/tpm/tpm_spapr.c | 8 | ||||
| -rw-r--r-- | hw/tpm/trace-events | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index e3775ad..dea7b13 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -93,9 +93,7 @@ struct SpaprTpmState { */ static void tpm_spapr_tpm_send(SpaprTpmState *s) { - if (trace_event_get_state_backends(TRACE_TPM_SPAPR_SHOW_BUFFER)) { - tpm_util_show_buffer(s->buffer, s->be_buffer_size, "To TPM"); - } + tpm_util_show_buffer(s->buffer, s->be_buffer_size, "To TPM"); s->state = SPAPR_VTPM_STATE_EXECUTION; s->cmd = (TPMBackendCmd) { @@ -255,9 +253,7 @@ static void tpm_spapr_request_completed(TPMIf *ti, int ret) rc = spapr_vio_dma_write(&s->vdev, be32_to_cpu(crq->data), s->buffer, len); - if (trace_event_get_state_backends(TRACE_TPM_SPAPR_SHOW_BUFFER)) { - tpm_util_show_buffer(s->buffer, len, "From TPM"); - } + tpm_util_show_buffer(s->buffer, len, "From TPM"); crq->valid = SPAPR_VTPM_MSG_RESULT; if (rc == H_SUCCESS) { diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 266de17..6005ecb 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -25,7 +25,6 @@ tpm_tis_pre_save(uint8_t locty, uint32_t rw_offset) "locty: %d, rw_offset = %u" tpm_ppi_memset(uint8_t *ptr, size_t size) "memset: %p %zu" # tpm_spapr.c -tpm_spapr_show_buffer(const char *direction, size_t len, const char *buf) "direction: %s len: %zu\n%s" tpm_spapr_do_crq(uint8_t raw1, uint8_t raw2) "1st 2 bytes in CRQ: 0x%02x 0x%02x" tpm_spapr_do_crq_crq_result(void) "SPAPR_VTPM_INIT_CRQ_RESULT" tpm_spapr_do_crq_crq_complete_result(void) "SPAPR_VTPM_INIT_CRQ_COMP_RESULT" |