mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tpm 2021/01/25 v1

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEuBi5yt+QicLVzsZrda1lgCoLQhEFAmAPd0IACgkQda1lgCoL
 QhFehAf/ftigqDuCFdONjlYTzls13Mq0ZD8aGpyUdluWxYVxpTiJax/M2tM1xQlx
 IqTiDs9rXgQlkX1YCs2ntiIjAeQnSQc5cjOuW9OztK9Q31/8vAd66jtbnIS80Sun
 O97UXNk+7uvQkbUA0r/hfneJ+jvu6vTrguvqBD909VugFEWTBAdtK1tN2FdB9E9v
 NjSyFMPDtfJFySPI3oIF/9cx0c+EiMUqw2pW8ptPWPcAgdNdM05chvSYUqc0YNIM
 S8RNL3DFFPotwaU9qbSrVEgVwzK/+6JPs9YJb4cIA43cUtp/qmHHa/uSdM3WqafZ
 nUQ0m90iO68pw6lx7g8MJ2DJHkrsxQ==
 =5xJ4
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2021-01-25-1' into staging

Merge tpm 2021/01/25 v1

# gpg: Signature made Tue 26 Jan 2021 01:58:26 GMT
# gpg:                using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# 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-2021-01-25-1:
  tpm: tpm_spapr: Remove unused tracepoint

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-01-26 09:51:02 +00:00
commit 9cd69f1a27
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"