[Qemu-devel] [PATCH] scsi: fix tracing of scsi requests with simple backend

[Qemu-devel] [PATCH] scsi: fix tracing of scsi requests with simple backend

[Paolo Bonzini]

The simple backend only supports a maximum of 6 arguments.  Split the
scsi_req_parsed event in two parts to cope with the limit.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi-bus.c |    6 +++++-
 trace-events  |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 837f24e..ad6a730 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -413,7 +413,11 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf)
     scsi_req_xfer_mode(req);
     req->cmd.lba = scsi_req_lba(req);
     trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, buf[0],
-                          req->cmd.mode, req->cmd.xfer, req->cmd.lba);
+                          req->cmd.mode, req->cmd.xfer);
+    if (req->cmd.lba != -1) {
+        trace_scsi_req_parsed_lba(req->dev->id, req->lun, req->tag, buf[0],
+                              req->cmd.lba);
+    }
     return 0;
 }
 
diff --git a/trace-events b/trace-events
index 3137a15..e0e9574 100644
--- a/trace-events
+++ b/trace-events
@@ -210,7 +210,8 @@ disable scsi_req_alloc(int target, int lun, int tag) "target %d lun %d tag %d"
 disable scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d"
 disable scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d"
 disable scsi_req_continue(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_parsed(int target, int lun, int tag, int cmd, int mode, int xfer) "target %d lun %d tag %d command %d dir %d length %d"
+disable scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba) "target %d lun %d tag %d command %d lba %"PRIu64""
 disable scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d"
 
 # vl.c
-- 
1.7.4.4

Re: [Qemu-devel] [PATCH] scsi: fix tracing of scsi requests with simple backend

[Blue Swirl]

Thanks, applied.

On Fri, Jun 3, 2011 at 3:57 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The simple backend only supports a maximum of 6 arguments.  Split the
> scsi_req_parsed event in two parts to cope with the limit.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/scsi-bus.c |    6 +++++-
>  trace-events  |    3 ++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
> index 837f24e..ad6a730 100644
> --- a/hw/scsi-bus.c
> +++ b/hw/scsi-bus.c
> @@ -413,7 +413,11 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf)
>     scsi_req_xfer_mode(req);
>     req->cmd.lba = scsi_req_lba(req);
>     trace_scsi_req_parsed(req->dev->id, req->lun, req->tag, buf[0],
> -                          req->cmd.mode, req->cmd.xfer, req->cmd.lba);
> +                          req->cmd.mode, req->cmd.xfer);
> +    if (req->cmd.lba != -1) {
> +        trace_scsi_req_parsed_lba(req->dev->id, req->lun, req->tag, buf[0],
> +                              req->cmd.lba);
> +    }
>     return 0;
>  }
>
> diff --git a/trace-events b/trace-events
> index 3137a15..e0e9574 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -210,7 +210,8 @@ disable scsi_req_alloc(int target, int lun, int tag) "target %d lun %d tag %d"
>  disable scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d"
>  disable scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d"
>  disable scsi_req_continue(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_parsed(int target, int lun, int tag, int cmd, int mode, int xfer) "target %d lun %d tag %d command %d dir %d length %d"
> +disable scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba) "target %d lun %d tag %d command %d lba %"PRIu64""
>  disable scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d"
>
>  # vl.c
> --
> 1.7.4.4
>
>
>