From 5aa0e6cb569a4eef1be0073eff3c315a3c7bf049 Mon Sep 17 00:00:00 2001 From: Bernhard Kohl Date: Tue, 31 Aug 2010 14:08:25 +0200 Subject: 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 Signed-off-by: Kevin Wolf (cherry picked from commit 2488b74081650a5312fe1515660b6cb095244c34) --- hw/scsi-disk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 384d19f113..2a107b1bfd 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; -- cgit v1.2.1