From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57859 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqPe6-0007YK-9A for qemu-devel@nongnu.org; Tue, 31 Aug 2010 08:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqPdx-0000i3-Hi for qemu-devel@nongnu.org; Tue, 31 Aug 2010 08:08:57 -0400 Received: from demumfd002.nsn-inter.net ([93.183.12.31]:10946) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqPdx-0000gi-2s for qemu-devel@nongnu.org; Tue, 31 Aug 2010 08:08:49 -0400 From: Bernhard Kohl Date: Tue, 31 Aug 2010 14:08:25 +0200 Message-Id: <1283256507-15467-5-git-send-email-bernhard.kohl@nsn.com> In-Reply-To: <1283256507-15467-1-git-send-email-bernhard.kohl@nsn.com> References: <1283256507-15467-1-git-send-email-bernhard.kohl@nsn.com> Subject: [Qemu-devel] [PATCH v3 4/6] scsi-disk: fix the block descriptor returned by the MODE SENSE command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Bernhard Kohl 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 --- hw/scsi-disk.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 1287cab..e085d5b 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -662,9 +662,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; -- 1.7.2.2