From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KxNLA-0005Jo-8A for qemu-devel@nongnu.org; Tue, 04 Nov 2008 09:57:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KxNL8-0005JZ-Iq for qemu-devel@nongnu.org; Tue, 04 Nov 2008 09:57:07 -0500 Received: from [199.232.76.173] (port=40696 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KxNL8-0005JW-Ag for qemu-devel@nongnu.org; Tue, 04 Nov 2008 09:57:06 -0500 Received: from smtp.eu.citrix.com ([62.200.22.115]:36676) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KxNL7-0003T3-So for qemu-devel@nongnu.org; Tue, 04 Nov 2008 09:57:06 -0500 Message-ID: <49106382.6070400@eu.citrix.com> Date: Tue, 04 Nov 2008 15:00:18 +0000 From: Stefano Stabellini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] windows cdrom cache flush 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 Windows only flushes its cache of a CDROM if it gets a SENSE_UNIT_ATTENTION CHECK_CONDITION response to a REQUEST_SENSE command. Make sure it does so after we change the CD. Signed-off-by: Stefano Stabellini Signed-off-by: Steven Smith --- diff --git a/hw/ide.c b/hw/ide.c index 33e8b39..836f23b 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -351,6 +351,7 @@ #define ASC_ILLEGAL_OPCODE 0x20 #define ASC_LOGICAL_BLOCK_OOR 0x21 #define ASC_INV_FIELD_IN_CMD_PACKET 0x24 +#define ASC_MEDIUM_MAY_HAVE_CHANGED 0x28 #define ASC_INCOMPATIBLE_FORMAT 0x30 #define ASC_MEDIUM_NOT_PRESENT 0x3a #define ASC_SAVING_PARAMETERS_NOT_SUPPORTED 0x39 @@ -1106,6 +1107,17 @@ static void ide_atapi_cmd_error(IDEState *s, int sense_key, int asc) ide_set_irq(s); } +static void ide_atapi_cmd_check_status(IDEState *s) +{ +#ifdef DEBUG_IDE_ATAPI + printf("atapi_cmd_check_status\n"); +#endif + s->error = MC_ERR | (SENSE_UNIT_ATTENTION << 4); + s->status = ERR_STAT; + s->nsector = 0; + ide_set_irq(s); +} + static inline void cpu_to_ube16(uint8_t *buf, int val) { buf[0] = val >> 8; @@ -1528,6 +1540,14 @@ static void ide_atapi_cmd(IDEState *s) printf("\n"); } #endif + /* If there's a UNIT_ATTENTION condition pending, only + REQUEST_SENSE and INQUIRY commands are allowed to complete. */ + if (s->sense_key == SENSE_UNIT_ATTENTION && + s->io_buffer[0] != GPCMD_REQUEST_SENSE && + s->io_buffer[0] != GPCMD_INQUIRY) { + ide_atapi_cmd_check_status(s); + return; + } switch(s->io_buffer[0]) { case GPCMD_TEST_UNIT_READY: if (bdrv_is_inserted(s->bs)) { @@ -1623,6 +1643,8 @@ static void ide_atapi_cmd(IDEState *s) buf[2] = s->sense_key; buf[7] = 10; buf[12] = s->asc; + if (s->sense_key == SENSE_UNIT_ATTENTION) + s->sense_key = SENSE_NONE; ide_atapi_cmd_reply(s, 18, max_len); break; case GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL: @@ -1974,9 +1996,13 @@ static void cdrom_change_cb(void *opaque) IDEState *s = opaque; uint64_t nb_sectors; - /* XXX: send interrupt too */ bdrv_get_geometry(s->bs, &nb_sectors); s->nb_sectors = nb_sectors; + + s->sense_key = SENSE_UNIT_ATTENTION; + s->asc = ASC_MEDIUM_MAY_HAVE_CHANGED; + + ide_set_irq(s); } static void ide_cmd_lba48_transform(IDEState *s, int lba48)