diff options
| author | Artyom Tarasenko <atar4qemu@googlemail.com> | 2009-10-13 23:46:24 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-10-14 18:31:02 +0000 |
| commit | 6550f2e676959bd9507ae311ca8df0b1939e77f3 (patch) | |
| tree | 56fbb2a01f8969d75fe6fe09036d8b36150c1231 | |
| parent | 930f3fe11f9d39b200ccefc8fd13709b110e4dfe (diff) | |
| download | qemu-6550f2e676959bd9507ae311ca8df0b1939e77f3.zip | |
scsi disk block descriptor v2
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 <atar4qemu@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/scsi-disk.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 3940726f2b..2a9268aa63 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; |