From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJXa3-0006Kk-WB for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:24:40 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJXZw-0006Cf-3x for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:24:35 -0500 Received: from [199.232.76.173] (port=57961 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJXZt-0006CG-VF for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:24:29 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:65472) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NJXZt-0003J6-Tx for qemu-devel@nongnu.org; Sat, 12 Dec 2009 14:24:30 -0500 Received: by fxm19 with SMTP id 19so1995449fxm.17 for ; Sat, 12 Dec 2009 11:24:27 -0800 (PST) From: Artyom Tarasenko Date: Sat, 12 Dec 2009 20:24:22 +0100 Message-Id: <1260645862-13701-1-git-send-email-atar4qemu@google.com> Subject: [Qemu-devel] [FOR 0.12 PATCH] scsi-disk: Inquiry with allocation length of CDB < 36 (v3) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Blue Swirl , Artyom Tarasenko According to the SCSI-2 specification, http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-08.html#8.2.5 , "if the allocation length of the command descriptor block (CDB) is too small to transfer all of the parameters, the additional length shall not be adjusted to reflect the truncation." The 36 mandatory bytes of response are written to outbuf, and then only the length requested in CDB is transferred. --- Signed-off-by: Artyom Tarasenko --- diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2e7a57b..495ba35 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -5,6 +5,12 @@ * Based on code by Fabrice Bellard * * Written by Paul Brook + * Modifications: + * 2009-Dec-12 Artyom Tarasenko : implemented stamdard inquiry for the case + * when the allocation length of CDB is smaller + * than 36. + * 2009-Oct-13 Artyom Tarasenko : implemented the block descriptor in the + * MODE SENSE response. * * This code is licenced under the LGPL. * @@ -406,11 +412,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) return -1; } - if (req->cmd.xfer < 36) { - BADF("Error: Inquiry (STANDARD) buffer size %zd " - "is less than 36 (TODO: only 5 required)\n", req->cmd.xfer); - } - buflen = req->cmd.xfer; if (buflen > SCSI_MAX_INQUIRY_LEN) buflen = SCSI_MAX_INQUIRY_LEN; @@ -436,7 +437,15 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) Some later commands are also implemented. */ outbuf[2] = 3; outbuf[3] = 2; /* Format 2 */ - outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */ + + if (len > 36) { + outbuf[4] = len - 5; /* Additional Length = (Len - 1) - 4 */ + } else { + /* If the allocation length of CDB is too small, + the additional length is not adjusted */ + outbuf[4] = 36 - 5; + } + /* Sync data transfer and TCQ. */ outbuf[7] = 0x10 | (req->bus->tcq ? 0x02 : 0); return buflen;