Commit cc7d320f authored by Stefan Berger's avatar Stefan Berger
Browse files

tpm: convert tpm_util.c to use trace-events 



Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 49d302fe

hw/tpm/tpm_util.c

+12 −17
Original line number Diff line number Diff line
@@ -28,14 +28,7 @@ 
#include "exec/memory.h"

#include "sysemu/tpm_backend.h"

#include "hw/qdev.h"



#define DEBUG_TPM 0



#define DPRINTF(fmt, ...) do { \

    if (DEBUG_TPM) { \

        fprintf(stderr, "tpm-util:"fmt"\n", ## __VA_ARGS__); \

    } \

} while (0)

#include "trace.h"



/* tpm backend property */
@@ -279,10 +272,11 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version, 


        if (be32_to_cpu(tpm_resp.hdr.len) != sizeof(tpm_resp) ||

            be32_to_cpu(tpm_resp.len) != sizeof(uint32_t)) {

            DPRINTF("tpm_resp->hdr.len = %u, expected = %zu\n",

                    be32_to_cpu(tpm_resp.hdr.len), sizeof(tpm_resp));

            DPRINTF("tpm_resp->len = %u, expected = %zu\n",

                    be32_to_cpu(tpm_resp.len), sizeof(uint32_t));

            trace_tpm_util_get_buffer_size_hdr_len(

                be32_to_cpu(tpm_resp.hdr.len),

                sizeof(tpm_resp));

            trace_tpm_util_get_buffer_size_len(be32_to_cpu(tpm_resp.len),

                                               sizeof(uint32_t));

            error_report("tpm_util: Got unexpected response to "

                         "TPM_GetCapability; errcode: 0x%x",

                         be32_to_cpu(tpm_resp.hdr.errcode));
@@ -327,9 +321,10 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version, 


        if (be32_to_cpu(tpm2_resp.hdr.len) != sizeof(tpm2_resp) ||

            be32_to_cpu(tpm2_resp.count) != 2) {

            DPRINTF("tpm2_resp->hdr.len = %u, expected = %zu\n",

                    be32_to_cpu(tpm2_resp.hdr.len), sizeof(tpm2_resp));

            DPRINTF("tpm2_resp->len = %u, expected = %u\n",

            trace_tpm_util_get_buffer_size_hdr_len2(

                be32_to_cpu(tpm2_resp.hdr.len),

                sizeof(tpm2_resp));

            trace_tpm_util_get_buffer_size_len2(

                be32_to_cpu(tpm2_resp.count), 2);

            error_report("tpm_util: Got unexpected response to "

                         "TPM2_GetCapability; errcode: 0x%x",
@@ -344,7 +339,7 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version, 
        return -EFAULT;

    }



    DPRINTF("buffersize of device: %zu\n", *buffersize);

    trace_tpm_util_get_buffer_size(*buffersize);



    return 0;

}

hw/tpm/trace-events

+7 −0
Original line number Diff line number Diff line
@@ -7,3 +7,10 @@ tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x" TA 
# hw/tpm/tpm_passthrough.c

tpm_passthrough_handle_request(void *cmd) "processing command %p"

tpm_passthrough_reset(void) "reset"



# hw/tpm/tpm_util.c

tpm_util_get_buffer_size_hdr_len(uint32_t len, size_t expected) "tpm_resp->hdr.len = %u, expected = %zu"

tpm_util_get_buffer_size_len(uint32_t len, size_t expected) "tpm_resp->len = %u, expected = %zu"

tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_resp->hdr.len = %u, expected = %zu"

tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp->len = %u, expected = %zu"

tpm_util_get_buffer_size(size_t len) "buffersize of device: %zu"