haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tpm: tpm_spapr: Remove unused tracepoint

Browse source 
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 8c8ed03850 ("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>
This commit is contained in:
Roman Bolshakov 2020-12-07 09:43:52 +03:00 committed by Stefan Berger
parent 31ee895047
commit 68a5b02a46
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/tpm/tpm_spapr.c
View file

@ -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) {

1
hw/tpm/trace-events
View file

@ -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"