Received: from [140.186.70.92] (port=55235 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8Mu-00009T-CO for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ov8Ms-0004Jb-Vu for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28149) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ov8Ms-0004JP-PV for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:42 -0400 From: Kevin Wolf Date: Mon, 13 Sep 2010 14:42:42 +0200 Message-Id: <1284381771-7333-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1284381771-7333-1-git-send-email-kwolf@redhat.com> References: <1284381771-7333-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.13][PATCH 04/13] 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: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: 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 Signed-off-by: Kevin Wolf (cherry picked from commit 2488b74081650a5312fe1515660b6cb095244c34) --- 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 384d19f..2a107b1 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; -- 1.7.2.2