From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPh3L-0007q6-RZ for qemu-devel@nongnu.org; Thu, 26 May 2011 16:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPh3K-0005rG-NE for qemu-devel@nongnu.org; Thu, 26 May 2011 16:21:07 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:35864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPh3K-0005r5-Kx for qemu-devel@nongnu.org; Thu, 26 May 2011 16:21:06 -0400 Received: by qyk36 with SMTP id 36so3390915qyk.4 for ; Thu, 26 May 2011 13:21:06 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1306407411-4290-2-git-send-email-pbonzini@redhat.com> References: <1306407411-4290-1-git-send-email-pbonzini@redhat.com> <1306407411-4290-2-git-send-email-pbonzini@redhat.com> From: Blue Swirl Date: Thu, 26 May 2011 23:20:46 +0300 Message-ID: Content-Type: text/plain; charset=UTF-8 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: qemu-devel@nongnu.org On Thu, May 26, 2011 at 1:56 PM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > Reviewed-by: Christoph Hellwig > --- > =C2=A0hw/scsi-bus.c | =C2=A0 =C2=A06 ++++++ > =C2=A0trace-events =C2=A0| =C2=A0 =C2=A06 ++++++ > =C2=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 @@ > =C2=A0#include "scsi-defs.h" > =C2=A0#include "qdev.h" > =C2=A0#include "blockdev.h" > +#include "trace.h" > > =C2=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 > =C2=A0 =C2=A0 req->lun =3D lun; > =C2=A0 =C2=A0 req->status =3D -1; > =C2=A0 =C2=A0 req->enqueued =3D true; > + =C2=A0 =C2=A0trace_scsi_req_alloc(req->dev->id, req->lun, req->tag); > =C2=A0 =C2=A0 QTAILQ_INSERT_TAIL(&d->requests, req, next); > =C2=A0 =C2=A0 return req; > =C2=A0} > @@ -159,6 +161,7 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t ta= g) > > =C2=A0static void scsi_req_dequeue(SCSIRequest *req) > =C2=A0{ > + =C2=A0 =C2=A0trace_scsi_req_dequeue(req->dev->id, req->lun, req->tag); > =C2=A0 =C2=A0 if (req->enqueued) { > =C2=A0 =C2=A0 =C2=A0 =C2=A0 QTAILQ_REMOVE(&req->dev->requests, req, next)= ; > =C2=A0 =C2=A0 =C2=A0 =C2=A0 req->enqueued =3D false; > @@ -195,6 +198,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t = *cmd) > =C2=A0 =C2=A0 =C2=A0 =C2=A0 req->cmd.len =3D 12; > =C2=A0 =C2=A0 =C2=A0 =C2=A0 break; > =C2=A0 =C2=A0 default: > + =C2=A0 =C2=A0 =C2=A0 =C2=A0trace_scsi_req_parse_bad(req->dev->id, req->= lun, req->tag, cmd[0]); > =C2=A0 =C2=A0 =C2=A0 =C2=A0 return -1; > =C2=A0 =C2=A0 } > > @@ -392,6 +396,8 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf) > =C2=A0 =C2=A0 memcpy(req->cmd.buf, buf, req->cmd.len); > =C2=A0 =C2=A0 scsi_req_xfer_mode(req); > =C2=A0 =C2=A0 req->cmd.lba =3D scsi_req_lba(req); > + =C2=A0 =C2=A0trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, bu= f[0], > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0req->cmd.mode, req->cmd.xfer, req->cmd.lba); > =C2=A0 =C2=A0 return 0; > =C2=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 ret= ) "dev %d, config %d, ret %d > =C2=A0disable usb_clear_device_feature(int addr, int feature, int ret) "d= ev %d, feature %d, ret %d" > =C2=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 t= ag %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) "targe= t %d lun %d tag %d command %d" Build fails with simpletrace enabled: CC oslib-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'