From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LSIQZ-0005LY-Ry
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 16:58:31 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LSIQZ-0005Kt-2r
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 16:58:31 -0500
Received: from [199.232.76.173] (port=38015 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LSIQY-0005KX-P0
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 16:58:30 -0500
Received: from savannah.gnu.org ([199.232.41.3]:42300 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LSIQY-0005li-3f
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 16:58:30 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LSIQX-00044a-Ev
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 21:58:29 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LSIQX-00044W-9z
	for qemu-devel@nongnu.org; Wed, 28 Jan 2009 21:58:29 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LSIQX-00044W-9z@cvs.savannah.gnu.org>
Date: Wed, 28 Jan 2009 21:58:29 +0000
Subject: [Qemu-devel] [6469] SCSI divide capacity by s->cluster_size (Rik
	van Riel)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6469
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6469
Author:   aliguori
Date:     2009-01-28 21:58:29 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
SCSI divide capacity by s->cluster_size (Rik van Riel)

Paul Brook pointed out that the number of sectors reported
by the SCSI read capacity commands needs to be divided by
s->cluster_size, because bdrv_get_geometry reports the number
of 512 byte sectors, while emulated CDROMs report 2048 byte
sectors back to the guest.

This has no consequences for emulated hard disks, which use
a cluster size of 1.

aliguori: fixed typo

Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/scsi-disk.c

Modified: trunk/hw/scsi-disk.c
===================================================================
--- trunk/hw/scsi-disk.c	2009-01-28 21:58:25 UTC (rev 6468)
+++ trunk/hw/scsi-disk.c	2009-01-28 21:58:29 UTC (rev 6469)
@@ -734,6 +734,7 @@
         /* The normal LEN field for this command is zero.  */
 	memset(outbuf, 0, 8);
 	bdrv_get_geometry(s->bdrv, &nb_sectors);
+        nb_sectors /= s->cluster_size;
         /* Returned value is the address of the last sector.  */
         if (nb_sectors) {
             nb_sectors--;
@@ -834,6 +835,7 @@
             DPRINTF("SAI READ CAPACITY(16)\n");
             memset(outbuf, 0, len);
             bdrv_get_geometry(s->bdrv, &nb_sectors);
+            nb_sectors /= s->cluster_size;
             /* Returned value is the address of the last sector.  */
             if (nb_sectors) {
                 nb_sectors--;