From patchwork Fri Jan 16 19:20:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Koch X-Patchwork-Id: 429991 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF6761401EB for ; Sat, 17 Jan 2015 06:22:30 +1100 (AEDT) Received: from localhost ([::1]:57040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCCTU-0003v9-Pi for incoming@patchwork.ozlabs.org; Fri, 16 Jan 2015 14:22:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCCRn-0001BQ-Gi for qemu-devel@nongnu.org; Fri, 16 Jan 2015 14:20:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YCCRj-0000Iv-IX for qemu-devel@nongnu.org; Fri, 16 Jan 2015 14:20:43 -0500 Received: from fldsmtpe04.verizon.com ([140.108.26.143]:32087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCCRj-0000Ij-EX for qemu-devel@nongnu.org; Fri, 16 Jan 2015 14:20:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verizon.com; i=dkoch@verizon.com; q=dns/txt; s=corp; t=1421436039; x=1452972039; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=XS84SD/W64dd7u1R3nVZ6GmNSciSoOEa6WtIGUF9gvA=; b=DGx3OIDXVMLEwakWAeEEUIvtVmizevgX+QbtVpzvYRViToXj2sxnfQRc QcuTw82KqMF2hGdXhri92DaRcpeoNMoA12IhtXPWIZu32BUK1fE92dt9s i/koWKu4aBdEpdKk80JjYq4CW3iufK8Bru/QGldbfBh2dBjQiFda4UpOm M=; X-IronPort-Anti-Spam-Filtered: false Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe04.verizon.com with ESMTP; 16 Jan 2015 19:20:37 +0000 X-VzAPP: 1 X-IronPort-AV: E=Sophos;i="5.09,412,1418083200"; d="scan'208";a="915456715" Received: from unknown (HELO yoyo.cloudswitch.com) ([208.52.205.215]) by fldsmtpi02.verizon.com with ESMTP; 16 Jan 2015 19:20:31 +0000 From: Don Koch To: qemu-devel@nongnu.org Date: Fri, 16 Jan 2015 14:20:24 -0500 Message-Id: <1421436025-2347-2-git-send-email-dkoch@verizon.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1421436025-2347-1-git-send-email-dkoch@verizon.com> References: <1421436025-2347-1-git-send-email-dkoch@verizon.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.108.26.143 Cc: Paolo Bonzini , Don Koch Subject: [Qemu-devel] [PATCH 1/2] Add trace calls to scsi-disk.c. 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: Don Koch --- hw/scsi/scsi-disk.c | 4 ++++ trace-events | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index f65618d..98bbead 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -37,6 +37,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include "sysemu/blockdev.h" #include "hw/block/block.h" #include "sysemu/dma.h" +#include "trace.h" #ifdef __linux #include @@ -533,6 +534,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) int buflen = 0; int start; + trace_scsi_disk_inquiry(req->cmd.buf[1], req->cmd.buf[2]); if (req->cmd.buf[1] & 0x1) { /* Vital product data */ uint8_t page_code = req->cmd.buf[2]; @@ -717,6 +719,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) /* Standard INQUIRY data */ if (req->cmd.buf[2] != 0) { + trace_scsi_disk_inquiry_err_standard(req->cmd.buf[2]); return -1; } @@ -1843,6 +1846,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf) case INQUIRY: buflen = scsi_disk_emulate_inquiry(req, outbuf); if (buflen < 0) { + trace_scsi_disk_inquiry_err_generic(buflen); goto illegal_request; } break; diff --git a/trace-events b/trace-events index 6a60f19..43fb0db 100644 --- a/trace-events +++ b/trace-events @@ -588,6 +588,11 @@ scsi_inquiry(int target, int lun, int tag, int cdb1, int cdb2) "target %d lun %d scsi_test_unit_ready(int target, int lun, int tag) "target %d lun %d tag %d" scsi_request_sense(int target, int lun, int tag) "target %d lun %d tag %d" +# hw/scsi/scsi-disk.c +scsi_disk_inquiry_err_standard(int buf2) "buf[2]=%u" +scsi_disk_inquiry_err_generic(int buflen) "buflen=%d" +scsi_disk_inquiry(int buf1, int buf2) "buf[1]=0x%x buf[2]=0x%x" + # vl.c vm_state_notify(int running, int reason) "running %d reason %d" load_file(const char *name, const char *path) "name %s location %s"