From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lnx7B-0001I7-TE
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lnx7B-0001Hv-A7
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:01 -0400
Received: from [199.232.76.173] (port=53060 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lnx7A-0001Hs-V0
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:00 -0400
Received: from savannah.gnu.org ([199.232.41.3]:34268 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 <blauwirbel@gmail.com>)
	id 1Lnx7A-0002wY-Jy
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 11:40:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <blauwirbel@gmail.com>) id 1Lnx7A-0006Gh-2r
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:40:00 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1Lnx79-0006Gc-RQ
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 15:39:59 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1Lnx79-0006Gc-RQ@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 15:39:59 +0000
Subject: [Qemu-devel] [6951] misc scsi disk/cdrom fixes/improvements 1/4
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: 6951
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6951
Author:   blueswir1
Date:     2009-03-29 15:39:59 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
misc scsi disk/cdrom fixes/improvements 1/4

Use correct sector size for cdrom Read TOC command

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>

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

Modified: trunk/hw/scsi-disk.c
===================================================================
--- trunk/hw/scsi-disk.c	2009-03-29 15:39:08 UTC (rev 6950)
+++ trunk/hw/scsi-disk.c	2009-03-29 15:39:59 UTC (rev 6951)
@@ -790,6 +790,7 @@
             start_track = buf[6];
             bdrv_get_geometry(s->bdrv, &nb_sectors);
             DPRINTF("Read TOC (track %d format %d msf %d)\n", start_track, format, msf >> 1);
+            nb_sectors /= s->cluster_size;
             switch(format) {
             case 0:
                 toclen = cdrom_read_toc(nb_sectors, outbuf, msf, start_track);