From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esos5-0004S4-Su for qemu-devel@nongnu.org; Mon, 05 Mar 2018 07:05:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esos2-0006hD-NI for qemu-devel@nongnu.org; Mon, 05 Mar 2018 07:05:37 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51610 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1esos2-0006h7-Gk for qemu-devel@nongnu.org; Mon, 05 Mar 2018 07:05:34 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w25C4U6Y069350 for ; Mon, 5 Mar 2018 07:05:33 -0500 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gh5dhrhqe-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Mon, 05 Mar 2018 07:05:33 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 Mar 2018 05:05:32 -0700 References: <1520200587-14681-1-git-send-email-stefanb@linux.vnet.ibm.com> <1520200587-14681-2-git-send-email-stefanb@linux.vnet.ibm.com> <20180305094937.GB3131@work-vm> From: Stefan Berger Date: Mon, 5 Mar 2018 07:05:27 -0500 MIME-Version: 1.0 In-Reply-To: <20180305094937.GB3131@work-vm> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Message-Id: <85dd51e6-9fa9-a369-922b-13bcb6e8d1f6@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH 1/5] tpm: convert tpm_crb.c to use trace-events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert" Cc: marcandre.lureau@redhat.com, qemu-devel@nongnu.org On 03/05/2018 04:49 AM, Dr. David Alan Gilbert wrote: > * Stefan Berger (stefanb@linux.vnet.ibm.com) wrote: >> Signed-off-by: Stefan Berger >> --- >> Makefile.objs | 1 + >> hw/tpm/tpm_crb.c | 17 +++++------------ >> hw/tpm/trace-events | 5 +++++ >> 3 files changed, 11 insertions(+), 12 deletions(-) >> create mode 100644 hw/tpm/trace-events >> >> diff --git a/Makefile.objs b/Makefile.objs >> index 5dc1348..72c3d8c 100644 >> --- a/Makefile.objs >> +++ b/Makefile.objs >> @@ -162,6 +162,7 @@ trace-events-subdirs += hw/alpha >> trace-events-subdirs += hw/hppa >> trace-events-subdirs += hw/xen >> trace-events-subdirs += hw/ide >> +trace-events-subdirs += hw/tpm >> trace-events-subdirs += ui >> trace-events-subdirs += audio >> trace-events-subdirs += net >> diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c >> index b5b8256..d8917cb 100644 >> --- a/hw/tpm/tpm_crb.c >> +++ b/hw/tpm/tpm_crb.c >> @@ -29,6 +29,7 @@ >> #include "sysemu/reset.h" >> #include "tpm_int.h" >> #include "tpm_util.h" >> +#include "trace.h" >> >> typedef struct CRBState { >> DeviceState parent_obj; >> @@ -44,14 +45,6 @@ typedef struct CRBState { >> >> #define CRB(obj) OBJECT_CHECK(CRBState, (obj), TYPE_TPM_CRB) >> >> -#define DEBUG_CRB 0 >> - >> -#define DPRINTF(fmt, ...) do { \ >> - if (DEBUG_CRB) { \ >> - printf(fmt, ## __VA_ARGS__); \ >> - } \ >> - } while (0) >> - >> #define CRB_INTF_TYPE_CRB_ACTIVE 0b1 >> #define CRB_INTF_VERSION_CRB 0b1 >> #define CRB_INTF_CAP_LOCALITY_0_ONLY 0b0 >> @@ -91,8 +84,8 @@ static uint64_t tpm_crb_mmio_read(void *opaque, hwaddr addr, >> unsigned offset = addr & 3; >> uint32_t val = *(uint32_t *)regs >> (8 * offset); >> >> - DPRINTF("CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 "\n", >> - addr, size, val); >> + trace_tpm_crb_mmio_read(addr, size, val); >> + >> return val; >> } >> >> @@ -100,8 +93,8 @@ static void tpm_crb_mmio_write(void *opaque, hwaddr addr, >> uint64_t val, unsigned size) >> { >> CRBState *s = CRB(opaque); >> - DPRINTF("CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx64 "\n", >> - addr, size, val); >> + >> + trace_tpm_crb_mmio_write(addr, size, val); >> >> switch (addr) { >> case A_CRB_CTRL_REQ: >> diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events >> new file mode 100644 >> index 0000000..336b06d >> --- /dev/null >> +++ b/hw/tpm/trace-events >> @@ -0,0 +1,5 @@ >> +# See docs/devel/tracing.txt for syntax documentation. >> + >> +# hw/tpm/tpm_crb.c >> +tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 >> +tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 > Have you checked that builds OK on 32bit? I think you'll need to use > PRIx64 there since the trace makes you use the uint64_t parameter. It builds fines as it is. Stefan