From patchwork Mon Aug 2 15:31:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Kohl X-Patchwork-Id: 60548 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 078BDB70A8 for ; Tue, 3 Aug 2010 01:39:52 +1000 (EST) Received: from localhost ([127.0.0.1]:42794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofx7F-0005YV-5H for incoming@patchwork.ozlabs.org; Mon, 02 Aug 2010 11:39:49 -0400 Received: from [140.186.70.92] (port=42466 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofwzo-0000ni-Dv for qemu-devel@nongnu.org; Mon, 02 Aug 2010 11:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofwzm-0001Lu-Ih for qemu-devel@nongnu.org; Mon, 02 Aug 2010 11:32:08 -0400 Received: from demumfd001.nsn-inter.net ([93.183.12.32]:10510) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofwzm-0001Lh-7q for qemu-devel@nongnu.org; Mon, 02 Aug 2010 11:32:06 -0400 Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd001.nsn-inter.net (8.12.11.20060308/8.12.11) with ESMTP id o72FW5i8018075 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 Aug 2010 17:32:05 +0200 Received: from localhost.localdomain ([10.148.23.89]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id o72FVmEU012299; Mon, 2 Aug 2010 17:32:04 +0200 From: Bernhard Kohl To: qemu-devel@nongnu.org Date: Mon, 2 Aug 2010 17:31:27 +0200 Message-Id: <1280763089-11829-3-git-send-email-bernhard.kohl@nsn.com> X-Mailer: git-send-email 1.7.2 In-Reply-To: <1280763089-11829-1-git-send-email-bernhard.kohl@nsn.com> References: <1280763089-11829-1-git-send-email-bernhard.kohl@nsn.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Bernhard Kohl Subject: [Qemu-devel] [PATCH 2/4] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command 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 The header for the MODE SENSE(10) command is 8 bytes long. Signed-off-by: Bernhard Kohl --- hw/scsi-disk.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 57439f4..927df54 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -606,6 +606,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) uint64_t nb_sectors; int page, dbd, buflen; uint8_t *p; + uint8_t dev_specific_param; dbd = req->cmd.buf[1] & 0x8; page = req->cmd.buf[2] & 0x3f; @@ -613,16 +614,31 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) memset(outbuf, 0, req->cmd.xfer); p = outbuf; - p[1] = 0; /* Default media type. */ - p[3] = 0; /* Block descriptor length. */ - if (bdrv_is_read_only(s->bs)) { - p[2] = 0x80; /* Readonly. */ + if (bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM || + bdrv_is_read_only(s->bs)) { + dev_specific_param = 0x80; /* Readonly. */ + } else { + dev_specific_param = 0x00; + } + + if (req->cmd.buf[0] == MODE_SENSE) { + p[1] = 0; /* Default media type. */ + p[2] = dev_specific_param; + p[3] = 0; /* Block descriptor length. */ + p += 4; + } else { /* MODE_SENSE_10 */ + p[2] = 0; /* Default media type. */ + p[3] = dev_specific_param; + p[6] = p[7] = 0; /* Block descriptor length. */ + p += 8; } - p += 4; bdrv_get_geometry(s->bs, &nb_sectors); if ((~dbd) & nb_sectors) { - outbuf[3] = 8; /* Block descriptor length */ + if (req->cmd.buf[0] == MODE_SENSE) + outbuf[3] = 8; /* Block descriptor length */ + else /* MODE_SENSE_10 */ + outbuf[7] = 8; /* Block descriptor length */ nb_sectors /= s->cluster_size; nb_sectors--; if (nb_sectors > 0xffffff) @@ -652,7 +668,12 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) } buflen = p - outbuf; - outbuf[0] = buflen - 1; + if (req->cmd.buf[0] == MODE_SENSE) { + outbuf[0] = buflen - 1; + } else { /* MODE_SENSE_10 */ + outbuf[0] = ((buflen - 1) >> 8) & 0xff; + outbuf[1] = (buflen - 1) & 0xff; + } if (buflen > req->cmd.xfer) buflen = req->cmd.xfer; return buflen;