From patchwork Thu Nov 26 14:34:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 39543 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 208921007E8 for ; Fri, 27 Nov 2009 02:46:02 +1100 (EST) Received: from localhost ([127.0.0.1]:36944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDgXf-0000eC-KZ for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 10:45:59 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDfRB-00074V-BG for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDfR2-0006rY-Vn for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:09 -0500 Received: from [199.232.76.173] (port=56175 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDfR1-0006qx-1t for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46722) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDfR0-0000Ia-HZ for qemu-devel@nongnu.org; Thu, 26 Nov 2009 09:35:02 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAQEZ194005951 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Nov 2009 09:35:01 -0500 Received: from zweiblum.home.kraxel.org (vpn2-8-164.ams2.redhat.com [10.36.8.164]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAQEYd9n016116; Thu, 26 Nov 2009 09:34:54 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 7E9EE7011D; Thu, 26 Nov 2009 15:34:18 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 15:34:13 +0100 Message-Id: <1259246056-5389-28-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.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 27/30] scsi-disk: restruct emulation: SERVICE_ACTION_IN 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 Move SERVICE_ACTION_IN emulation from scsi_send_command() to scsi_disk_emulate_command(). Also add SERVICE_ACTION_IN to scsi-defs.h and scsi_command_name(). Signed-off-by: Gerd Hoffmann --- hw/scsi-bus.c | 1 + hw/scsi-defs.h | 1 + hw/scsi-disk.c | 67 ++++++++++++++++++++++++++----------------------------- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 09b6fa9..deb6b4f 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -441,6 +441,7 @@ static const char *scsi_command_name(uint8_t cmd) [ REWIND ] = "REWIND", [ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT", [ GET_CONFIGURATION ] = "GET_CONFIGURATION", + [ SERVICE_ACTION_IN ] = "SERVICE_ACTION_IN", [ LOAD_UNLOAD ] = "LOAD_UNLOAD", [ SET_CD_SPEED ] = "SET_CD_SPEED", [ BLANK ] = "BLANK", diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index fbcfaa6..4aeb667 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -100,6 +100,7 @@ #define REWIND 0x01 #define REPORT_DENSITY_SUPPORT 0x44 #define GET_CONFIGURATION 0x46 +#define SERVICE_ACTION_IN 0x9e #define LOAD_UNLOAD 0xa6 #define SET_CD_SPEED 0xbb #define BLANK 0xa1 diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 4a3e6fe..b481c13 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -756,6 +756,37 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) outbuf[7] = 8; // CD-ROM buflen = 8; break; + case SERVICE_ACTION_IN: + /* Service Action In subcommands. */ + if ((req->cmd.buf[1] & 31) == 0x10) { + DPRINTF("SAI READ CAPACITY(16)\n"); + memset(outbuf, 0, req->cmd.xfer); + bdrv_get_geometry(bdrv, &nb_sectors); + if (!nb_sectors) + goto not_ready; + nb_sectors /= s->cluster_size; + /* Returned value is the address of the last sector. */ + nb_sectors--; + /* Remember the new size for read/write sanity checking. */ + s->max_lba = nb_sectors; + outbuf[0] = (nb_sectors >> 56) & 0xff; + outbuf[1] = (nb_sectors >> 48) & 0xff; + outbuf[2] = (nb_sectors >> 40) & 0xff; + outbuf[3] = (nb_sectors >> 32) & 0xff; + outbuf[4] = (nb_sectors >> 24) & 0xff; + outbuf[5] = (nb_sectors >> 16) & 0xff; + outbuf[6] = (nb_sectors >> 8) & 0xff; + outbuf[7] = nb_sectors & 0xff; + outbuf[8] = 0; + outbuf[9] = 0; + outbuf[10] = s->cluster_size * 2; + outbuf[11] = 0; + /* Protection, exponent and lowest lba field left blank. */ + buflen = req->cmd.xfer; + break; + } + DPRINTF("Unsupported Service Action In\n"); + goto illegal_request; default: goto illegal_request; } @@ -780,7 +811,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, uint8_t *buf, int lun) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, d); - uint64_t nb_sectors; uint64_t lba; uint32_t len; int cmdlen; @@ -873,6 +903,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, case SYNCHRONIZE_CACHE: case READ_TOC: case GET_CONFIGURATION: + case SERVICE_ACTION_IN: rc = scsi_disk_emulate_command(&r->req, outbuf); if (rc > 0) { r->iov.iov_len = rc; @@ -901,40 +932,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector_count = len * s->cluster_size; is_write = 1; break; - case 0x9e: - /* Service Action In subcommands. */ - if ((buf[1] & 31) == 0x10) { - DPRINTF("SAI READ CAPACITY(16)\n"); - memset(outbuf, 0, len); - bdrv_get_geometry(s->qdev.dinfo->bdrv, &nb_sectors); - nb_sectors /= s->cluster_size; - /* Returned value is the address of the last sector. */ - if (nb_sectors) { - nb_sectors--; - /* Remember the new size for read/write sanity checking. */ - s->max_lba = nb_sectors; - outbuf[0] = (nb_sectors >> 56) & 0xff; - outbuf[1] = (nb_sectors >> 48) & 0xff; - outbuf[2] = (nb_sectors >> 40) & 0xff; - outbuf[3] = (nb_sectors >> 32) & 0xff; - outbuf[4] = (nb_sectors >> 24) & 0xff; - outbuf[5] = (nb_sectors >> 16) & 0xff; - outbuf[6] = (nb_sectors >> 8) & 0xff; - outbuf[7] = nb_sectors & 0xff; - outbuf[8] = 0; - outbuf[9] = 0; - outbuf[10] = s->cluster_size * 2; - outbuf[11] = 0; - /* Protection, exponent and lowest lba field left blank. */ - r->iov.iov_len = len; - } else { - scsi_command_complete(r, CHECK_CONDITION, NOT_READY); - return 0; - } - break; - } - DPRINTF("Unsupported Service Action In\n"); - goto fail; case 0xa0: DPRINTF("Report LUNs (len %d)\n", len); if (len < 16)