From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPsSh-0003m5-If for qemu-devel@nongnu.org; Fri, 27 May 2011 04:32:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPsSg-00049X-Bo for qemu-devel@nongnu.org; Fri, 27 May 2011 04:32:03 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:46794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPsSg-00049Q-7n for qemu-devel@nongnu.org; Fri, 27 May 2011 04:32:02 -0400 Received: by gxk26 with SMTP id 26so756629gxk.4 for ; Fri, 27 May 2011 01:32:01 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <1306407411-4290-1-git-send-email-pbonzini@redhat.com> <1306407411-4290-2-git-send-email-pbonzini@redhat.com> Date: Fri, 27 May 2011 09:32:01 +0100 Message-ID: From: Stefan Hajnoczi Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v5 01/25] scsi: add tracing of scsi requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Blue Swirl , qemu-devel@nongnu.org On Thu, May 26, 2011 at 9:20 PM, Blue Swirl wrote: > On Thu, May 26, 2011 at 1:56 PM, Paolo Bonzini wrot= e: >> Signed-off-by: Paolo Bonzini >> Reviewed-by: Christoph Hellwig >> --- >> =A0hw/scsi-bus.c | =A0 =A06 ++++++ >> =A0trace-events =A0| =A0 =A06 ++++++ >> =A02 files changed, 12 insertions(+), 0 deletions(-) >> >> diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c >> index ceeb4ec..0fd85fc 100644 >> --- a/hw/scsi-bus.c >> +++ b/hw/scsi-bus.c >> @@ -4,6 +4,7 @@ >> =A0#include "scsi-defs.h" >> =A0#include "qdev.h" >> =A0#include "blockdev.h" >> +#include "trace.h" >> >> =A0static char *scsibus_get_fw_dev_path(DeviceState *dev); >> >> @@ -141,6 +142,7 @@ SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice = *d, uint32_t tag, uint32_t l >> =A0 =A0 req->lun =3D lun; >> =A0 =A0 req->status =3D -1; >> =A0 =A0 req->enqueued =3D true; >> + =A0 =A0trace_scsi_req_alloc(req->dev->id, req->lun, req->tag); >> =A0 =A0 QTAILQ_INSERT_TAIL(&d->requests, req, next); >> =A0 =A0 return req; >> =A0} >> @@ -159,6 +161,7 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t t= ag) >> >> =A0static void scsi_req_dequeue(SCSIRequest *req) >> =A0{ >> + =A0 =A0trace_scsi_req_dequeue(req->dev->id, req->lun, req->tag); >> =A0 =A0 if (req->enqueued) { >> =A0 =A0 =A0 =A0 QTAILQ_REMOVE(&req->dev->requests, req, next); >> =A0 =A0 =A0 =A0 req->enqueued =3D false; >> @@ -195,6 +198,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t= *cmd) >> =A0 =A0 =A0 =A0 req->cmd.len =3D 12; >> =A0 =A0 =A0 =A0 break; >> =A0 =A0 default: >> + =A0 =A0 =A0 =A0trace_scsi_req_parse_bad(req->dev->id, req->lun, req->t= ag, cmd[0]); >> =A0 =A0 =A0 =A0 return -1; >> =A0 =A0 } >> >> @@ -392,6 +396,8 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf) >> =A0 =A0 memcpy(req->cmd.buf, buf, req->cmd.len); >> =A0 =A0 scsi_req_xfer_mode(req); >> =A0 =A0 req->cmd.lba =3D scsi_req_lba(req); >> + =A0 =A0trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, buf[0], >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0req->cmd.mode, req-= >cmd.xfer, req->cmd.lba); >> =A0 =A0 return 0; >> =A0} >> >> diff --git a/trace-events b/trace-events >> index 385cb00..b11b71d 100644 >> --- a/trace-events >> +++ b/trace-events >> @@ -205,6 +205,12 @@ disable usb_set_config(int addr, int config, int re= t) "dev %d, config %d, ret %d >> =A0disable usb_clear_device_feature(int addr, int feature, int ret) "dev= %d, feature %d, ret %d" >> =A0disable usb_set_device_feature(int addr, int feature, int ret) "dev %= d, feature %d, ret %d" >> >> +# hw/scsi-bus.c >> +disable scsi_req_alloc(int target, int lun, int tag) "target %d lun %d = tag %d" >> +disable scsi_req_dequeue(int target, int lun, int tag) "target %d lun %= d tag %d" >> +disable scsi_req_parsed(int target, int lun, int tag, int cmd, int mode= , int xfer, uint64_t lba) "target %d lun %d tag %d command %d dir %d length= %d lba %"PRIu64"" >> +disable scsi_req_parse_bad(int target, int lun, int tag, int cmd) "targ= et %d lun %d tag %d command %d" > > Build fails with simpletrace enabled: > =A0CC =A0 =A0oslib-posix.o > cc1: warnings being treated as errors > In file included from /src/qemu/oslib-posix.c:32: > ./trace.h: In function 'trace_scsi_req_parsed': > ./trace.h:716: error: implicit declaration of function 'trace7' > ./trace.h:716: error: nested extern declaration of 'trace7' The simple trace backend only records 6 arguments. Either you can eliminate an argument from this trace event or you could extend the record size (and bump the version header). Stefan