summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Kohl <bernhard.kohl@nsn.com>2010-08-31 14:08:25 +0200
committerKevin Wolf <kwolf@redhat.com>2010-09-13 14:31:23 +0200
commit5aa0e6cb569a4eef1be0073eff3c315a3c7bf049 (patch)
tree01bd8257ee5ed2ac57420f22e1c0cc85ba97cb2a
parentscsi-disk: respect the page control (PC) field in the MODE SENSE command (diff)
downloadqemu-kvm-5aa0e6cb569a4eef1be0073eff3c315a3c7bf049.tar.gz
qemu-kvm-5aa0e6cb569a4eef1be0073eff3c315a3c7bf049.tar.bz2
qemu-kvm-5aa0e6cb569a4eef1be0073eff3c315a3c7bf049.zip
scsi-disk: fix the block descriptor returned by the MODE SENSE command
The block descriptor contains the number of blocks, not the highest LBA. Real hard disks return 0 if the number of blocks exceed the maximum 0xFFFFFF. SCSI-Spec: http://ldkelley.com/SCSI2/SCSI2/SCSI2-08.html#8.3.3 "The number of blocks field specifies the number of logical blocks on the medium to which the density code and block length fields apply. A value of zero indicates that all of the remaining logical blocks of the logical unit shall have the medium characteristics specified." Signed-off-by: Bernhard Kohl <bernhard.kohl@nsn.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 2488b74081650a5312fe1515660b6cb095244c34)
-rw-r--r--hw/scsi-disk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 384d19f11..2a107b1bf 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -661,9 +661,8 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf)
outbuf[7] = 8; /* Block descriptor length */
}
nb_sectors /= s->cluster_size;
- nb_sectors--;
if (nb_sectors > 0xffffff)
- nb_sectors = 0xffffff;
+ nb_sectors = 0;
p[0] = 0; /* media density code */
p[1] = (nb_sectors >> 16) & 0xff;
p[2] = (nb_sectors >> 8) & 0xff;