From patchwork Thu Nov 26 14:34:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39549 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 54E2C1007D9 for ; Fri, 27 Nov 2009 02:56:37 +1100 (EST) Received: from localhost ([127.0.0.1]:42993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDghu-0003L2-4Z for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 10:56:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDfRC-00074c-13 for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDfR5-0006vk-Hi for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:09 -0500 Received: from [199.232.76.173] (port=56181 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDfR4-0006vR-Ep for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1288) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDfR4-0000JW-0g for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:06 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAQEZ5nQ030622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Nov 2009 09:35:05 -0500 Received: from zweiblum.home.kraxel.org (vpn2-8-164.ams2.redhat.com [10.36.8.164]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAQEYqlB001326; Thu, 26 Nov 2009 09:34:56 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 8D2E770120; Thu, 26 Nov 2009 15:34:18 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 15:34:16 +0100 Message-Id: <1259246056-5389-31-git-send-email-kraxel@redhat.com> In-Reply-To: <1259246056-5389-1-git-send-email-kraxel@redhat.com> References: <1259246056-5389-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 30/30] scsi: add read/write 16 commands. 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 Add READ_16 + friends to scsi-defs.h, scsi_command_name() and the request parsing helper functions. Use them in scsi-disk.c too. Signed-off-by: Gerd Hoffmann --- hw/scsi-bus.c | 8 ++++++++ hw/scsi-defs.h | 3 +++ hw/scsi-disk.c | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index b6de5c6..736e91e 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -228,6 +228,8 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) case WRITE_6: case WRITE_12: case WRITE_VERIFY_12: + case WRITE_16: + case WRITE_VERIFY_16: req->cmd.xfer *= req->dev->blocksize; break; case READ_10: @@ -235,6 +237,7 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) case READ_REVERSE: case RECOVER_BUFFERED_DATA: case READ_12: + case READ_16: req->cmd.xfer *= req->dev->blocksize; break; case INQUIRY: @@ -277,6 +280,8 @@ static void scsi_req_xfer_mode(SCSIRequest *req) case WRITE_VERIFY: case WRITE_12: case WRITE_VERIFY_12: + case WRITE_16: + case WRITE_VERIFY_16: case COPY: case COPY_VERIFY: case COMPARE: @@ -441,6 +446,9 @@ static const char *scsi_command_name(uint8_t cmd) [ REWIND ] = "REWIND", [ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT", [ GET_CONFIGURATION ] = "GET_CONFIGURATION", + [ READ_16 ] = "READ_16", + [ WRITE_16 ] = "WRITE_16", + [ WRITE_VERIFY_16 ] = "WRITE_VERIFY_16", [ SERVICE_ACTION_IN ] = "SERVICE_ACTION_IN", [ REPORT_LUNS ] = "REPORT_LUNS", [ LOAD_UNLOAD ] = "LOAD_UNLOAD", diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index cc7f35e..4759d80 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -100,6 +100,9 @@ #define REWIND 0x01 #define REPORT_DENSITY_SUPPORT 0x44 #define GET_CONFIGURATION 0x46 +#define READ_16 0x88 +#define WRITE_16 0x8a +#define WRITE_VERIFY_16 0x8e #define SERVICE_ACTION_IN 0x9e #define REPORT_LUNS 0xa0 #define LOAD_UNLOAD 0xa6 diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2910782..c802ccd 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -926,7 +926,8 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, break; case READ_6: case READ_10: - case 0x88: + case READ_12: + case READ_16: DPRINTF("Read (sector %" PRId64 ", count %d)\n", lba, len); if (lba > s->max_lba) goto illegal_lba; @@ -935,7 +936,8 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, break; case WRITE_6: case WRITE_10: - case 0x8a: + case WRITE_12: + case WRITE_16: DPRINTF("Write (sector %" PRId64 ", count %d)\n", lba, len); if (lba > s->max_lba) goto illegal_lba;