From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MxpCo-0007dX-A7 for qemu-devel@nongnu.org; Tue, 13 Oct 2009 17:46:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MxpCj-0007XU-Ha for qemu-devel@nongnu.org; Tue, 13 Oct 2009 17:46:53 -0400 Received: from [199.232.76.173] (port=41854 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MxpCj-0007X3-8K for qemu-devel@nongnu.org; Tue, 13 Oct 2009 17:46:49 -0400 Received: from mail-yw0-f176.google.com ([209.85.211.176]:44196) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MxpCi-0004a1-Of for qemu-devel@nongnu.org; Tue, 13 Oct 2009 17:46:48 -0400 Received: by ywh6 with SMTP id 6so9419603ywh.4 for ; Tue, 13 Oct 2009 14:46:45 -0700 (PDT) MIME-Version: 1.0 From: Artyom Tarasenko Date: Tue, 13 Oct 2009 23:46:24 +0200 Message-ID: Content-Type: multipart/mixed; boundary=00163628398077fa910475d7fb04 Subject: [Qemu-devel] [PATCH] scsi disk block descriptor v2 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Blue Swirl , "Krumme, Chris" --00163628398077fa910475d7fb04 Content-Type: text/plain; charset=ISO-8859-1 The SCSI-2 documentation suggests, that although the block descriptor is optional for an arbitrary SCSI-2 device (chapter 8.2.10, http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2/SCSI2-08.html ) it is mandatory for a disk: chapters 9.1.2, 9.3.3 ( http://ldkelley.com/SCSI2/SCSI2/SCSI2/SCSI2-09.html ) don't say "optional" any more, just "The block descriptor in the MODE SENSE data describes the block lengths that are used on the medium." v2: limit the number of sectors reported in the block descriptor to 24 bits. Signed-off-by: Artyom Tarasenko --- diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 3940726..2a9268a 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -624,7 +624,9 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, { uint8_t *p; int page; - + int dbd; + + dbd = buf[1] & 0x8; page = buf[2] & 0x3f; DPRINTF("Mode Sense (page %d, len %d)\n", page, len); p = outbuf; @@ -635,6 +637,24 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, outbuf[2] = 0x80; /* Readonly. */ } p += 4; + bdrv_get_geometry(s->dinfo->bdrv, &nb_sectors); + if ((~dbd) & nb_sectors) { + nb_sectors /= s->cluster_size; + nb_sectors--; + if (nb_sectors > 0xffffff) + nb_sectors = 0xffffff; + outbuf[3] = 8; /* Block descriptor length */ + p[0] = 0; /* media density code */ + p[1] = (nb_sectors >> 16) & 0xff; + p[2] = (nb_sectors >> 8) & 0xff; + p[3] = nb_sectors & 0xff; + p[4] = 0; /* reserved */ + p[5] = 0; /* bytes 5-7 are the sector size in bytes */ + p[6] = s->cluster_size * 2; + p[7] = 0; + p += 8; + } + if (page == 4) { int cylinders, heads, secs; --00163628398077fa910475d7fb04 Content-Type: application/octet-stream; name="0001-scsi-disk-block-descriptor.patch" Content-Disposition: attachment; filename="0001-scsi-disk-block-descriptor.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_g0r6jhpe0 U2lnbmVkLW9mZi1ieTogQXJ0eW9tIFRhcmFzZW5rbyA8YXRhcjRxZW11QGdtYWlsLmNvbT4KLS0t CmRpZmYgLS1naXQgYS9ody9zY3NpLWRpc2suYyBiL2h3L3Njc2ktZGlzay5jCmluZGV4IDM5NDA3 MjYuLjJhOTI2OGEgMTAwNjQ0Ci0tLSBhL2h3L3Njc2ktZGlzay5jCisrKyBiL2h3L3Njc2ktZGlz ay5jCkBAIC02MjQsNyArNjI0LDkgQEAgc3RhdGljIGludDMyX3Qgc2NzaV9zZW5kX2NvbW1hbmQo U0NTSURldmljZSAqZCwgdWludDMyX3QgdGFnLAogICAgICAgICB7CiAgICAgICAgICAgICB1aW50 OF90ICpwOwogICAgICAgICAgICAgaW50IHBhZ2U7Ci0KKyAgICAgICAgICAgIGludCBkYmQ7Cisg ICAgICAgICAgICAKKyAgICAgICAgICAgIGRiZCA9IGJ1ZlsxXSAgJiAweDg7CiAgICAgICAgICAg ICBwYWdlID0gYnVmWzJdICYgMHgzZjsKICAgICAgICAgICAgIERQUklOVEYoIk1vZGUgU2Vuc2Ug KHBhZ2UgJWQsIGxlbiAlZClcbiIsIHBhZ2UsIGxlbik7CiAgICAgICAgICAgICBwID0gb3V0YnVm OwpAQCAtNjM1LDYgKzYzNywyNCBAQCBzdGF0aWMgaW50MzJfdCBzY3NpX3NlbmRfY29tbWFuZChT Q1NJRGV2aWNlICpkLCB1aW50MzJfdCB0YWcsCiAgICAgICAgICAgICAgICAgb3V0YnVmWzJdID0g MHg4MDsgLyogUmVhZG9ubHkuICAqLwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcCArPSA0 OworICAgICAgICAgICAgYmRydl9nZXRfZ2VvbWV0cnkocy0+ZGluZm8tPmJkcnYsICZuYl9zZWN0 b3JzKTsKKyAgICAgICAgICAgIGlmICgofmRiZCkgJiBuYl9zZWN0b3JzKSB7CisgICAgICAgICAg ICAgICAgbmJfc2VjdG9ycyAvPSBzLT5jbHVzdGVyX3NpemU7CisgICAgICAgICAgICAgICAgbmJf c2VjdG9ycy0tOworICAgICAgICAgICAgICAgIGlmIChuYl9zZWN0b3JzID4gMHhmZmZmZmYpCisg ICAgICAgICAgICAgICAgICAgIG5iX3NlY3RvcnMgPSAweGZmZmZmZjsKKyAgICAgICAgICAgICAg ICBvdXRidWZbM10gPSA4OyAvKiBCbG9jayBkZXNjcmlwdG9yIGxlbmd0aCAgKi8KKyAgICAgICAg ICAgICAgICBwWzBdID0gMDsgLyogbWVkaWEgZGVuc2l0eSBjb2RlICovCisgICAgICAgICAgICAg ICAgcFsxXSA9IChuYl9zZWN0b3JzID4+IDE2KSAmIDB4ZmY7CisgICAgICAgICAgICAgICAgcFsy XSA9IChuYl9zZWN0b3JzID4+IDgpICYgMHhmZjsKKyAgICAgICAgICAgICAgICBwWzNdID0gbmJf c2VjdG9ycyAmIDB4ZmY7CisgICAgICAgICAgICAgICAgcFs0XSA9IDA7IC8qIHJlc2VydmVkICov CisgICAgICAgICAgICAgICAgcFs1XSA9IDA7IC8qIGJ5dGVzIDUtNyBhcmUgdGhlIHNlY3RvciBz aXplIGluIGJ5dGVzICovCisgICAgICAgICAgICAgICAgcFs2XSA9IHMtPmNsdXN0ZXJfc2l6ZSAq IDI7CisgICAgICAgICAgICAgICAgcFs3XSA9IDA7CisgICAgICAgICAgICAgICAgcCArPSA4Owor ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBpZiAocGFnZSA9PSA0KSB7CiAgICAgICAgICAg ICAgICAgaW50IGN5bGluZGVycywgaGVhZHMsIHNlY3M7CiAK --00163628398077fa910475d7fb04--