From patchwork Fri May 27 12:51:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 97677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A82E4B6F8C for ; Fri, 27 May 2011 22:52:07 +1000 (EST) Received: from localhost ([::1]:49662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPwWK-0008Su-OV for incoming@patchwork.ozlabs.org; Fri, 27 May 2011 08:52:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:51617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPwWE-0008Sp-Bu for qemu-devel@nongnu.org; Fri, 27 May 2011 08:51:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPwWD-00045M-Bh for qemu-devel@nongnu.org; Fri, 27 May 2011 08:51:58 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:57178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPwWD-00045H-6w for qemu-devel@nongnu.org; Fri, 27 May 2011 08:51:57 -0400 Received: by pzk30 with SMTP id 30so813214pzk.4 for ; Fri, 27 May 2011 05:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to; bh=TFlDnXfsgvpbePbEAOuNHL8YtnOvjeW81WROyUecKfA=; b=uS++TFpULbFJii007r/KatKOtyRDZiK8GryEkNL0IpEwqOo7MCLv/9s7MSknlaQtYj qIO+GFP5iXz20Ggoi2S8LXwu448iKPOGCUvWUy1NRqsldUvfy4pyivuSxQR8LhSPpllN cFB1J9G5eRGa3y30GLg/qvbVDKKIidzOsPSYs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to; b=orZiXpvpIY6dS3yifzQqOGcnfhqZyF6/s7vdpdUIUPt6E8cfXfiRKFzJSMNUMsIV7f NTJkTC/jBlj3zJiwIdvK9r+GcThKOslzG2Orf5SgfAVG0X+vm6ro5aBuRChaavKhyB8y dZKSQUeBVZqLEWnrprwKIKgzLl847i40YT+S8= Received: by 10.142.150.27 with SMTP id x27mr348336wfd.221.1306500716148; Fri, 27 May 2011 05:51:56 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id z7sm1390177wff.5.2011.05.27.05.51.53 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 May 2011 05:51:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 27 May 2011 14:51:28 +0200 Message-Id: <1306500690-12323-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1306407411-4290-2-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH v6 01/25] scsi: add tracing of scsi requests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Christoph Hellwig Cc: Blue Swirl --- hw/scsi-bus.c | 10 ++++++++++ trace-events | 7 +++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index ceeb4ec..740316f 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -4,6 +4,7 @@ #include "scsi-defs.h" #include "qdev.h" #include "blockdev.h" +#include "trace.h" 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->status = -1; req->enqueued = true; + trace_scsi_req_alloc(req->dev->id, req->lun, req->tag); QTAILQ_INSERT_TAIL(&d->requests, req, next); return req; } @@ -159,6 +161,7 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t tag) static void scsi_req_dequeue(SCSIRequest *req) { + trace_scsi_req_dequeue(req->dev->id, req->lun, req->tag); if (req->enqueued) { QTAILQ_REMOVE(&req->dev->requests, req, next); req->enqueued = false; @@ -195,6 +198,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) req->cmd.len = 12; break; default: + trace_scsi_req_parse_bad(req->dev->id, req->lun, req->tag, cmd[0]); return -1; } @@ -392,6 +396,12 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf) memcpy(req->cmd.buf, buf, req->cmd.len); 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); + 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 385cb00..eb283f4 100644 --- a/trace-events +++ b/trace-events @@ -205,6 +205,13 @@ 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_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) "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 disable vm_state_notify(int running, int reason) "running %d reason %d"