From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWBiJ-0004Iv-4o for qemu-devel@nongnu.org; Wed, 29 Jul 2009 12:09:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWBiE-0004BG-Ev for qemu-devel@nongnu.org; Wed, 29 Jul 2009 12:09:10 -0400 Received: from [199.232.76.173] (port=48198 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWBiE-0004Aj-AE for qemu-devel@nongnu.org; Wed, 29 Jul 2009 12:09:06 -0400 Received: from mx2.redhat.com ([66.187.237.31]:39458) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWBiD-0002uv-EJ for qemu-devel@nongnu.org; Wed, 29 Jul 2009 12:09:05 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6TG94nQ001879 for ; Wed, 29 Jul 2009 12:09:04 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6TG93RP024426 for ; Wed, 29 Jul 2009 12:09:04 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6TG92e1031699 for ; Wed, 29 Jul 2009 12:09:03 -0400 Date: Wed, 29 Jul 2009 19:09:02 +0300 From: Gleb Natapov Message-ID: <20090729160902.GG30449@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH v3] make windows notice media change List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Windows seems to be very stupid about cdrom media change. It polls cdrom status and if status goes ready->media not present->ready it assumes that media was changed. If "media not present" step doesn't happen even if "medium may have changed" was seen it assumes media haven't changed. Fake "media not present" step. Signed-off-by: Gleb Natapov --- v1->v2: do not reuse media_changed. Save/restore on migration. v2->v3: allow migration from 2 to 3. diff --git a/hw/ide.c b/hw/ide.c index 1e56786..7da400e 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -418,6 +418,7 @@ typedef struct IDEState { /* ATAPI specific */ uint8_t sense_key; uint8_t asc; + uint8_t cdrom_changed; int packet_transfer_size; int elementary_transfer_size; int io_buffer_index; @@ -1644,9 +1645,10 @@ static void ide_atapi_cmd(IDEState *s) } switch(s->io_buffer[0]) { case GPCMD_TEST_UNIT_READY: - if (bdrv_is_inserted(s->bs)) { + if (bdrv_is_inserted(s->bs) && !s->cdrom_changed) { ide_atapi_cmd_ok(s); } else { + s->cdrom_changed = 0; ide_atapi_cmd_error(s, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT); } @@ -2106,7 +2108,7 @@ static void cdrom_change_cb(void *opaque) s->sense_key = SENSE_UNIT_ATTENTION; s->asc = ASC_MEDIUM_MAY_HAVE_CHANGED; - + s->cdrom_changed = 1; ide_set_irq(s); } @@ -3211,6 +3213,7 @@ static void pci_ide_save(QEMUFile* f, void *opaque) /* per IDE drive data */ for(i = 0; i < 4; i++) { ide_save(f, &d->ide_if[i]); + qemu_put_8s(f, &d->ide_if[i].cdrom_changed); } } @@ -3219,7 +3222,7 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) PCIIDEState *d = opaque; int ret, i; - if (version_id != 2) + if (version_id < 2) return -EINVAL; ret = pci_device_load(&d->dev, f); if (ret < 0) @@ -3250,6 +3253,8 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id) /* per IDE drive data */ for(i = 0; i < 4; i++) { ide_load(f, &d->ide_if[i]); + if (version_id == 3) + qemu_get_8s(f, &d->ide_if[i].cdrom_changed); } return 0; } @@ -3339,7 +3344,7 @@ void pci_cmd646_ide_init(PCIBus *bus, BlockDriverState **hd_table, ide_init2(&d->ide_if[0], hd_table[0], hd_table[1], irq[0]); ide_init2(&d->ide_if[2], hd_table[2], hd_table[3], irq[1]); - register_savevm("ide", 0, 2, pci_ide_save, pci_ide_load, d); + register_savevm("ide", 0, 3, pci_ide_save, pci_ide_load, d); qemu_register_reset(cmd646_reset, d); cmd646_reset(d); } -- Gleb.