From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IxRLf-00023O-Db for qemu-devel@nongnu.org; Wed, 28 Nov 2007 13:09:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IxRLd-00022Z-S2 for qemu-devel@nongnu.org; Wed, 28 Nov 2007 13:09:23 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IxRLd-00022K-HQ for qemu-devel@nongnu.org; Wed, 28 Nov 2007 13:09:21 -0500 Received: from tapir.sajinet.com.pe ([66.139.79.212]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IxRLd-00027z-55 for qemu-devel@nongnu.org; Wed, 28 Nov 2007 13:09:21 -0500 Date: Wed, 28 Nov 2007 12:15:27 -0600 From: Carlo Marcelo Arenas Belon Message-ID: <20071128181527.GA3757@tapir> References: <20071128180630.GA351@tapir> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20071128180630.GA351@tapir> Subject: [Qemu-devel] [PATCH 1/5] qemu: GET_CONFIGURATION fixes for MMC-6 DVD-ROM implementation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm-devel@lists.sourceforge.net, qemu-devel@nongnu.org The following patch complements "Partial IDE DVD emulation", added in ide.c revision 1.66 and that was generating the following timeouts for OpenSolaris guests when trying to access the ATAPI cdrom (during installation for example): WARNING: /pci@0,0/pci-ide@1,1/ide@1 (ata1); timeout: abort request, target=0 lun=0 WARNING: /pci@0,0/pci-ide@1,1/ide@1 (ata1): timeout: abort device, target=0 lun=0 WARNING: /pci@0,0/pci-ide@1,1/ide@1 (ata1): timeout: reset target, target=0 lun=0 WARNING: /pci@0,0/pci-ide@1,1/ide@1 (ata1): timeout: reset bus, target=0 lun=0 The changes required to the "GET CONFIGURATION" implementation are : * recognize and honor "Allocation Length" command parameter * only set "current profile" for the response if a profile is current (either CD or DVD loaded) * calculate "data length" including all headers * refactor code and add comments to help document references to all implemented standards (ATAPI-4, SPC-3 and MMC-6) Signed-off-by: Carlo Marcelo Arenas Belon --- qemu/hw/ide.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/qemu/hw/ide.c b/qemu/hw/ide.c index 329d053..29fc7a9 100644 --- a/qemu/hw/ide.c +++ b/qemu/hw/ide.c @@ -1648,6 +1648,7 @@ static void ide_atapi_cmd(IDEState *s) break; case GPCMD_GET_CONFIGURATION: { + uint32_t len; int64_t total_sectors; /* only feature 0 is supported */ @@ -1656,17 +1657,27 @@ static void ide_atapi_cmd(IDEState *s) ASC_INV_FIELD_IN_CMD_PACKET); break; } - memset(buf, 0, 32); + max_len = ube16_to_cpu(packet + 7); bdrv_get_geometry(s->bs, &total_sectors); - buf[3] = 16; - buf[7] = total_sectors <= 1433600 ? 0x08 : 0x10; /* current profile */ - buf[10] = 0x10 | 0x1; - buf[11] = 0x08; /* size of profile list */ + memset(buf, 0, 32); + if (total_sectors) { + if (total_sectors > 1433600) { + buf[7] = 0x10; /* DVD-ROM */ + } else { + buf[7] = 0x08; /* CD-ROM */ + } + } else { + buf[7] = 0x00; /* no current profile */ + } + buf[10] = 0x02 | 0x01; /* persistent and current */ + buf[11] = 0x08; /* size of profile list = 4 bytes per profile */ buf[13] = 0x10; /* DVD-ROM profile */ - buf[14] = buf[7] == 0x10; /* (in)active */ + buf[14] = buf[13] == buf[7]; /* (in)active */ buf[17] = 0x08; /* CD-ROM profile */ - buf[18] = buf[7] == 0x08; /* (in)active */ - ide_atapi_cmd_reply(s, 32, 32); + buf[18] = buf[17] == buf[7]; /* (in)active */ + len = 8 + 4 + buf[11]; /* headers + size of profile list */ + cpu_to_ube32(buf, len - 4); /* data length */ + ide_atapi_cmd_reply(s, len, max_len); break; } default: -- 1.5.2.5