From patchwork Tue Sep 6 10:31:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 113530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7308DB6F6F for ; Tue, 6 Sep 2011 20:32:28 +1000 (EST) Received: from localhost ([::1]:46115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0sx6-0005at-W3 for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2011 06:32:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0swg-0004Ia-Ct for qemu-devel@nongnu.org; Tue, 06 Sep 2011 06:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0swf-0007RQ-0S for qemu-devel@nongnu.org; Tue, 06 Sep 2011 06:31:58 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:61012) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0swe-0007Qv-LT for qemu-devel@nongnu.org; Tue, 06 Sep 2011 06:31:56 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so4799376vxi.4 for ; Tue, 06 Sep 2011 03:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=JM2+/7p++y3U1rnDDosLNiZyiRh0eDg18uLSy+kStH4=; b=cwj4owzODmA3mEGjMY1dWdOY7O1r6+K7zQ7q6TGu0VHhu8eA+03cu6WCqlzVeDEmm4 Ru9fmDuWC29QeCqjFZab9BZe0SH4zv5YAQ2ON59ijE57uSqV8tfQpddMuAVVFhK2LZ1U LQCUf7GXzrkMoohAzX6EPfYisd8BFN9zSU/iM= Received: by 10.52.70.104 with SMTP id l8mr2316428vdu.188.1315305116295; Tue, 06 Sep 2011 03:31:56 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id da15sm6982805vdb.26.2011.09.06.03.31.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Sep 2011 03:31:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Sep 2011 12:31:44 +0200 Message-Id: <1315305104-7219-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Subject: [Qemu-devel] [PATCH] scsi: improve MODE SENSE emulation 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 - do not return extra pages when requesting all pages (PAGE CODE = 0x3f) - return correct sense code for PC = 3 (saved parameters not supported) - do not return geometry pages for CD devices Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 96 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 43 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 487f6cb..eaff8b8 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -583,12 +583,12 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) return buflen; } -static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p, +static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, int page_control) { - SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); BlockDriverState *bdrv = s->bs; int cylinders, heads, secs; + uint8_t *p = *p_outbuf; /* * If Changeable Values are requested, a mask denoting those mode parameters @@ -598,10 +598,13 @@ static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p, */ switch (page) { case 4: /* Rigid disk device geometry page. */ + if (s->qdev.type == TYPE_ROM) { + return -1; + } p[0] = 4; p[1] = 0x16; if (page_control == 1) { /* Changeable Values */ - return p[1] + 2; + break; } /* if a geometry hint is available, use it */ bdrv_get_geometry_hint(bdrv, &cylinders, &heads, &secs); @@ -627,13 +630,16 @@ static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p, /* Medium rotation rate [rpm], 5400 rpm */ p[20] = (5400 >> 8) & 0xff; p[21] = 5400 & 0xff; - return p[1] + 2; + break; case 5: /* Flexible disk device geometry page. */ + if (s->qdev.type == TYPE_ROM) { + return -1; + } p[0] = 5; p[1] = 0x1e; if (page_control == 1) { /* Changeable Values */ - return p[1] + 2; + break; } /* Transfer rate [kbit/s], 5Mbit/s */ p[2] = 5000 >> 8; @@ -666,26 +672,27 @@ static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p, /* Medium rotation rate [rpm], 5400 rpm */ p[28] = (5400 >> 8) & 0xff; p[29] = 5400 & 0xff; - return p[1] + 2; + break; case 8: /* Caching page. */ p[0] = 8; p[1] = 0x12; if (page_control == 1) { /* Changeable Values */ - return p[1] + 2; + break; } if (bdrv_enable_write_cache(s->bs)) { p[2] = 4; /* WCE */ } - return p[1] + 2; + break; case 0x2a: /* CD Capabilities and Mechanical Status page. */ - if (s->qdev.type != TYPE_ROM) - return 0; + if (s->qdev.type != TYPE_ROM) { + return -1; + } p[0] = 0x2a; p[1] = 0x14; if (page_control == 1) { /* Changeable Values */ - return p[1] + 2; + break; } p[2] = 3; // CD-R & CD-RW read p[3] = 0; // Writing not supported @@ -710,27 +717,30 @@ static int mode_sense_page(SCSIRequest *req, int page, uint8_t *p, p[19] = (16 * 176) & 0xff; p[20] = (16 * 176) >> 8; // 16x write speed current p[21] = (16 * 176) & 0xff; - return p[1] + 2; + break; default: - return 0; + return -1; } + + *p_outbuf += p[1] + 2; + return p[1] + 2; } -static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) +static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf) { - SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); uint64_t nb_sectors; - int page, dbd, buflen, page_control; + int page, dbd, buflen, ret, page_control; uint8_t *p; uint8_t dev_specific_param; - dbd = req->cmd.buf[1] & 0x8; - page = req->cmd.buf[2] & 0x3f; - page_control = (req->cmd.buf[2] & 0xc0) >> 6; + dbd = r->req.cmd.buf[1] & 0x8; + page = r->req.cmd.buf[2] & 0x3f; + page_control = (r->req.cmd.buf[2] & 0xc0) >> 6; DPRINTF("Mode Sense(%d) (page %d, xfer %zd, page_control %d)\n", - (req->cmd.buf[0] == MODE_SENSE) ? 6 : 10, page, req->cmd.xfer, page_control); - memset(outbuf, 0, req->cmd.xfer); + (r->req.cmd.buf[0] == MODE_SENSE) ? 6 : 10, page, r->req.cmd.xfer, page_control); + memset(outbuf, 0, r->req.cmd.xfer); p = outbuf; if (bdrv_is_read_only(s->bs)) { @@ -739,7 +749,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) dev_specific_param = 0x00; } - if (req->cmd.buf[0] == MODE_SENSE) { + if (r->req.cmd.buf[0] == MODE_SENSE) { p[1] = 0; /* Default media type. */ p[2] = dev_specific_param; p[3] = 0; /* Block descriptor length. */ @@ -753,7 +763,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) bdrv_get_geometry(s->bs, &nb_sectors); if (!dbd && nb_sectors) { - if (req->cmd.buf[0] == MODE_SENSE) { + if (r->req.cmd.buf[0] == MODE_SENSE) { outbuf[3] = 8; /* Block descriptor length */ } else { /* MODE_SENSE_10 */ outbuf[7] = 8; /* Block descriptor length */ @@ -772,23 +782,21 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) p += 8; } - if (page_control == 3) { /* Saved Values */ - return -1; /* ILLEGAL_REQUEST */ + if (page_control == 3) { + /* Saved Values */ + scsi_check_condition(r, SENSE_CODE(SAVING_PARAMS_NOT_SUPPORTED)); + return -1; } - switch (page) { - case 0x04: - case 0x05: - case 0x08: - case 0x2a: - p += mode_sense_page(req, page, p, page_control); - break; - case 0x3f: - p += mode_sense_page(req, 0x08, p, page_control); - p += mode_sense_page(req, 0x2a, p, page_control); - break; - default: - return -1; /* ILLEGAL_REQUEST */ + if (page == 0x3f) { + for (page = 0; page <= 0x3e; page++) { + mode_sense_page(s, page, &p, page_control); + } + } else { + ret = mode_sense_page(s, page, &p, page_control); + if (ret == -1) { + return -1; + } } buflen = p - outbuf; @@ -797,14 +805,14 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) * following data that is available to be transferred. The mode data * length does not include itself. */ - if (req->cmd.buf[0] == MODE_SENSE) { + if (r->req.cmd.buf[0] == MODE_SENSE) { outbuf[0] = buflen - 1; } else { /* MODE_SENSE_10 */ outbuf[0] = ((buflen - 2) >> 8) & 0xff; outbuf[1] = (buflen - 2) & 0xff; } - if (buflen > req->cmd.xfer) - buflen = req->cmd.xfer; + if (buflen > r->req.cmd.xfer) + buflen = r->req.cmd.xfer; return buflen; } @@ -880,7 +888,7 @@ static int scsi_disk_emulate_command(SCSIDiskReq *r) break; case MODE_SENSE: case MODE_SENSE_10: - buflen = scsi_disk_emulate_mode_sense(req, outbuf); + buflen = scsi_disk_emulate_mode_sense(r, outbuf); if (buflen < 0) goto illegal_request; break; @@ -1001,7 +1009,9 @@ not_ready: return -1; illegal_request: - scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); + if (r->req.status == -1) { + scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); + } return -1; }