diff options
author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-08-06 11:31:06 +0000 |
---|---|---|
committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-08-06 11:31:06 +0000 |
commit | 51c1ebb1bc2642296379a8db1ba9dfb4f78a2f80 (patch) | |
tree | ab7ba0ec98087a6d0aec6d661b5db9246fa750ab | |
parent | 6eb5733a3cad93b00043d48fa22b9df7d1f5ab33 (diff) | |
download | hqemu-51c1ebb1bc2642296379a8db1ba9dfb4f78a2f80.zip hqemu-51c1ebb1bc2642296379a8db1ba9dfb4f78a2f80.tar.gz |
Fix SCSI off-by-one device size.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2091 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r-- | hw/scsi-disk.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index decab1f..f545c89 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -348,15 +348,21 @@ int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int lun) /* The normal LEN field for this command is zero. */ memset(s->buf, 0, 8); bdrv_get_geometry(s->bdrv, &nb_sectors); - s->buf[0] = (nb_sectors >> 24) & 0xff; - s->buf[1] = (nb_sectors >> 16) & 0xff; - s->buf[2] = (nb_sectors >> 8) & 0xff; - s->buf[3] = nb_sectors & 0xff; - s->buf[4] = 0; - s->buf[5] = 0; - s->buf[6] = s->cluster_size * 2; - s->buf[7] = 0; - s->buf_len = 8; + /* Returned value is the address of the last sector. */ + if (nb_sectors) { + nb_sectors--; + s->buf[0] = (nb_sectors >> 24) & 0xff; + s->buf[1] = (nb_sectors >> 16) & 0xff; + s->buf[2] = (nb_sectors >> 8) & 0xff; + s->buf[3] = nb_sectors & 0xff; + s->buf[4] = 0; + s->buf[5] = 0; + s->buf[6] = s->cluster_size * 2; + s->buf[7] = 0; + s->buf_len = 8; + } else { + scsi_command_complete(s, SENSE_NOT_READY); + } break; case 0x08: case 0x28: |