scsi: add tracing of scsi requests

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Paolo Bonzini 2011-04-15 11:51:13 +02:00
parent aa29141d84
commit 5138efecf2
2 changed files with 12 additions and 0 deletions

View File

@ -4,6 +4,7 @@
#include "scsi-defs.h" #include "scsi-defs.h"
#include "qdev.h" #include "qdev.h"
#include "blockdev.h" #include "blockdev.h"
#include "trace.h"
static char *scsibus_get_fw_dev_path(DeviceState *dev); static 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
req->lun = lun; req->lun = lun;
req->status = -1; req->status = -1;
req->enqueued = true; req->enqueued = true;
trace_scsi_req_alloc(req->dev->id, req->lun, req->tag);
QTAILQ_INSERT_TAIL(&d->requests, req, next); QTAILQ_INSERT_TAIL(&d->requests, req, next);
return req; return req;
} }
@ -159,6 +161,7 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t tag)
static void scsi_req_dequeue(SCSIRequest *req) static void scsi_req_dequeue(SCSIRequest *req)
{ {
trace_scsi_req_dequeue(req->dev->id, req->lun, req->tag);
if (req->enqueued) { if (req->enqueued) {
QTAILQ_REMOVE(&req->dev->requests, req, next); QTAILQ_REMOVE(&req->dev->requests, req, next);
req->enqueued = false; req->enqueued = false;
@ -195,6 +198,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd)
req->cmd.len = 12; req->cmd.len = 12;
break; break;
default: default:
trace_scsi_req_parse_bad(req->dev->id, req->lun, req->tag, cmd[0]);
return -1; return -1;
} }
@ -392,6 +396,8 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf)
memcpy(req->cmd.buf, buf, req->cmd.len); memcpy(req->cmd.buf, buf, req->cmd.len);
scsi_req_xfer_mode(req); scsi_req_xfer_mode(req);
req->cmd.lba = scsi_req_lba(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);
return 0; return 0;
} }

View File

@ -205,6 +205,12 @@ disable usb_set_config(int addr, int config, int ret) "dev %d, config %d, ret %d
disable usb_clear_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" disable usb_clear_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d"
disable usb_set_device_feature(int addr, int feature, int ret) "dev %d, feature %d, ret %d" disable 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) "target %d lun %d tag %d command %d"
# vl.c # vl.c
disable vm_state_notify(int running, int reason) "running %d reason %d" disable vm_state_notify(int running, int reason) "running %d reason %d"