From patchwork Tue Nov 17 10:17:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38617 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 39D9BB7067 for ; Tue, 17 Nov 2009 21:50:54 +1100 (EST) Received: from localhost ([127.0.0.1]:50413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NALe6-0004a4-LA for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 05:50:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8g-0000PA-PJ for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8b-0000LI-66 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:21 -0500 Received: from [199.232.76.173] (port=58262 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8a-0000Ky-Nx for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25332) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8a-0006yv-10 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:16 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAIESR019233 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:18:15 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAHAI0fi001839; Tue, 17 Nov 2009 05:18:10 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 6548912008; Tue, 17 Nov 2009 11:17:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 11:17:51 +0100 Message-Id: <1258453071-3496-16-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 15/15] scsi: add scsi_req_print() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Handy for debugging. Signed-off-by: Gerd Hoffmann --- hw/scsi-bus.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/scsi.h | 1 + 2 files changed, 115 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index edfe099..50fc03a 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -343,6 +343,120 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf) return 0; } +static const char *scsi_command_name(uint8_t cmd) +{ + static const char *names[] = { + [ TEST_UNIT_READY ] = "TEST_UNIT_READY", + [ REZERO_UNIT ] = "REZERO_UNIT", + [ REQUEST_SENSE ] = "REQUEST_SENSE", + [ FORMAT_UNIT ] = "FORMAT_UNIT", + [ READ_BLOCK_LIMITS ] = "READ_BLOCK_LIMITS", + [ REASSIGN_BLOCKS ] = "REASSIGN_BLOCKS", + [ READ_6 ] = "READ_6", + [ WRITE_6 ] = "WRITE_6", + [ SEEK_6 ] = "SEEK_6", + [ READ_REVERSE ] = "READ_REVERSE", + [ WRITE_FILEMARKS ] = "WRITE_FILEMARKS", + [ SPACE ] = "SPACE", + [ INQUIRY ] = "INQUIRY", + [ RECOVER_BUFFERED_DATA ] = "RECOVER_BUFFERED_DATA", + [ MODE_SELECT ] = "MODE_SELECT", + [ RESERVE ] = "RESERVE", + [ RELEASE ] = "RELEASE", + [ COPY ] = "COPY", + [ ERASE ] = "ERASE", + [ MODE_SENSE ] = "MODE_SENSE", + [ START_STOP ] = "START_STOP", + [ RECEIVE_DIAGNOSTIC ] = "RECEIVE_DIAGNOSTIC", + [ SEND_DIAGNOSTIC ] = "SEND_DIAGNOSTIC", + [ ALLOW_MEDIUM_REMOVAL ] = "ALLOW_MEDIUM_REMOVAL", + + [ SET_WINDOW ] = "SET_WINDOW", + [ READ_CAPACITY ] = "READ_CAPACITY", + [ READ_10 ] = "READ_10", + [ WRITE_10 ] = "WRITE_10", + [ SEEK_10 ] = "SEEK_10", + [ WRITE_VERIFY ] = "WRITE_VERIFY", + [ VERIFY ] = "VERIFY", + [ SEARCH_HIGH ] = "SEARCH_HIGH", + [ SEARCH_EQUAL ] = "SEARCH_EQUAL", + [ SEARCH_LOW ] = "SEARCH_LOW", + [ SET_LIMITS ] = "SET_LIMITS", + [ PRE_FETCH ] = "PRE_FETCH", + [ READ_POSITION ] = "READ_POSITION", + [ SYNCHRONIZE_CACHE ] = "SYNCHRONIZE_CACHE", + [ LOCK_UNLOCK_CACHE ] = "LOCK_UNLOCK_CACHE", + [ READ_DEFECT_DATA ] = "READ_DEFECT_DATA", + [ MEDIUM_SCAN ] = "MEDIUM_SCAN", + [ COMPARE ] = "COMPARE", + [ COPY_VERIFY ] = "COPY_VERIFY", + [ WRITE_BUFFER ] = "WRITE_BUFFER", + [ READ_BUFFER ] = "READ_BUFFER", + [ UPDATE_BLOCK ] = "UPDATE_BLOCK", + [ READ_LONG ] = "READ_LONG", + [ WRITE_LONG ] = "WRITE_LONG", + [ CHANGE_DEFINITION ] = "CHANGE_DEFINITION", + [ WRITE_SAME ] = "WRITE_SAME", + [ READ_TOC ] = "READ_TOC", + [ LOG_SELECT ] = "LOG_SELECT", + [ LOG_SENSE ] = "LOG_SENSE", + [ MODE_SELECT_10 ] = "MODE_SELECT_10", + [ RESERVE_10 ] = "RESERVE_10", + [ RELEASE_10 ] = "RELEASE_10", + [ MODE_SENSE_10 ] = "MODE_SENSE_10", + [ PERSISTENT_RESERVE_IN ] = "PERSISTENT_RESERVE_IN", + [ PERSISTENT_RESERVE_OUT ] = "PERSISTENT_RESERVE_OUT", + [ MOVE_MEDIUM ] = "MOVE_MEDIUM", + [ READ_12 ] = "READ_12", + [ WRITE_12 ] = "WRITE_12", + [ WRITE_VERIFY_12 ] = "WRITE_VERIFY_12", + [ SEARCH_HIGH_12 ] = "SEARCH_HIGH_12", + [ SEARCH_EQUAL_12 ] = "SEARCH_EQUAL_12", + [ SEARCH_LOW_12 ] = "SEARCH_LOW_12", + [ READ_ELEMENT_STATUS ] = "READ_ELEMENT_STATUS", + [ SEND_VOLUME_TAG ] = "SEND_VOLUME_TAG", + [ WRITE_LONG_2 ] = "WRITE_LONG_2", + + [ REWIND ] = "REWIND", + [ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT", + [ LOAD_UNLOAD ] = "LOAD_UNLOAD", + [ SET_CD_SPEED ] = "SET_CD_SPEED", + [ BLANK ] = "BLANK", + }; + + if (cmd >= ARRAY_SIZE(names) || names[cmd] == NULL) + return "*UNKNOWN*"; + return names[cmd]; +} + +void scsi_req_print(SCSIRequest *req) +{ + FILE *fp = stderr; + int i; + + fprintf(fp, "[%s id=%d] %s", + req->dev->qdev.parent_bus->name, + req->dev->id, + scsi_command_name(req->cmd.buf[0])); + for (i = 1; i < req->cmd.len; i++) { + fprintf(fp, " 0x%02x", req->cmd.buf[i]); + } + switch (req->cmd.mode) { + case SCSI_XFER_NONE: + fprintf(fp, " - none\n"); + break; + case SCSI_XFER_FROM_DEV: + fprintf(fp, " - from-dev len=%zd\n", req->cmd.xfer); + break; + case SCSI_XFER_TO_DEV: + fprintf(fp, " - to-dev len=%zd\n", req->cmd.xfer); + break; + default: + fprintf(fp, " - Oops\n"); + break; + } +} + void scsi_req_complete(SCSIRequest *req) { assert(req->status != -1); diff --git a/hw/scsi.h b/hw/scsi.h index 370932b..3b151cf 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -104,6 +104,7 @@ void scsi_dev_set_sense(SCSIDevice *dev, uint8_t key); void scsi_req_init(SCSIRequest *req, SCSIDevice *d, uint32_t tag, uint32_t lun); int scsi_req_parse(SCSIRequest *req, uint8_t *buf); +void scsi_req_print(SCSIRequest *req); void scsi_req_complete(SCSIRequest *req); #endif