From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Iwa7p-0006hX-N8 for qemu-devel@nongnu.org; Mon, 26 Nov 2007 04:19:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Iwa7o-0006fl-SZ for qemu-devel@nongnu.org; Mon, 26 Nov 2007 04:19:33 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Iwa7o-0006fP-O6 for qemu-devel@nongnu.org; Mon, 26 Nov 2007 04:19:32 -0500 Received: from tapir.sajinet.com.pe ([66.139.79.212]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Iwa7o-0005rR-Bj for qemu-devel@nongnu.org; Mon, 26 Nov 2007 04:19:32 -0500 Date: Mon, 26 Nov 2007 03:25:22 -0600 From: Carlo Marcelo Arenas Belon Message-ID: <20071126092522.GA1476@tapir> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] ide: fix GPCMD_GET_CONFIGURATION for OpenSolaris guests Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The following patch complements "Partial IDE DVD emulation" which was added in 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 It has been tested not to introduce any regressions with Linux, BSD and Windows 2K guests and to fix the problem by installing a new guest with Nexenta OpenSolaris alpha7. The changes required are : * change the model name (used by "INQUIRY" and "IDENTIFY DEVICE") to DVD * recognize and honor "Allocation Length" parameter in "GET CONFIGURATION" * only set "current profile" for the "GET CONFIGURATION" response if a profile is current (CD or DVD loaded) * calculate "data length" including all headers * refactor code and add comments to help document references to all related standards (ATAPI-4, SPC-3 and MMC-6) Carlo PS. some parts of the current implementation are for ATA-2 and not all those standards are implemented fully AFAIK --- Index: hw/ide.c =================================================================== RCS file: /sources/qemu/qemu/hw/ide.c,v retrieving revision 1.72 diff -u -p -r1.72 ide.c --- hw/ide.c 18 Nov 2007 01:44:37 -0000 1.72 +++ hw/ide.c 26 Nov 2007 07:43:43 -0000 @@ -541,7 +541,7 @@ static void ide_atapi_identify(IDEState put_le16(p + 21, 512); /* cache size in sectors */ put_le16(p + 22, 4); /* ecc bytes */ padstr((uint8_t *)(p + 23), QEMU_VERSION, 8); /* firmware version */ - padstr((uint8_t *)(p + 27), "QEMU CD-ROM", 40); /* model */ + padstr((uint8_t *)(p + 27), "QEMU DVD-ROM", 40); /* model */ put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */ #ifdef USE_DMA_CDROM put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */ @@ -1630,12 +1630,13 @@ static void ide_atapi_cmd(IDEState *s) buf[6] = 0; /* reserved */ buf[7] = 0; /* reserved */ padstr8(buf + 8, 8, "QEMU"); - padstr8(buf + 16, 16, "QEMU CD-ROM"); + padstr8(buf + 16, 16, "QEMU DVD-ROM"); padstr8(buf + 32, 4, QEMU_VERSION); ide_atapi_cmd_reply(s, 36, max_len); break; case GPCMD_GET_CONFIGURATION: { + uint32_t len; int64_t total_sectors; /* only feature 0 is supported */ @@ -1644,17 +1645,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: