diff options
| -rw-r--r-- | hw/ide.c | 56 |
1 files changed, 18 insertions, 38 deletions
@@ -358,7 +358,7 @@ typedef struct IDEState { uint8_t *data_ptr; uint8_t *data_end; uint8_t io_buffer[MAX_MULT_SECTORS*512 + 4]; - QEMUTimer *sector_write_timer; /* only used for win2k instal hack */ + QEMUTimer *sector_write_timer; /* only used for win2k install hack */ uint32_t irq_count; /* counts IRQs when using win2k install hack */ /* CF-ATA extended error */ uint8_t ext_error; @@ -865,44 +865,10 @@ static void ide_sector_write_timer_cb(void *opaque) ide_set_irq(s); } -static void ide_sector_write_aio_cb(void *opaque, int ret) -{ - BMDMAState *bm = opaque; - IDEState *s = bm->ide_if; - -#ifdef TARGET_I386 - if (win2k_install_hack && ((++s->irq_count % 16) == 0)) { - /* It seems there is a bug in the Windows 2000 installer HDD - IDE driver which fills the disk with empty logs when the - IDE write IRQ comes too early. This hack tries to correct - that at the expense of slower write performances. Use this - option _only_ to install Windows 2000. You must disable it - for normal use. */ - qemu_mod_timer(s->sector_write_timer, - qemu_get_clock(vm_clock) + (ticks_per_sec / 1000)); - } else -#endif - { - ide_set_irq(s); - } - bm->aiocb = NULL; -} - static void ide_sector_write(IDEState *s) { - BMDMAState *bm; int64_t sector_num; - int n, n1; - - s->io_buffer_index = 0; - s->io_buffer_size = 0; - bm = s->bmdma; - if(bm == NULL) { - bm = qemu_mallocz(sizeof(BMDMAState)); - s->bmdma = bm; - } - bm->ide_if = s; - bm->dma_cb = ide_sector_write_aio_cb; + int ret, n, n1; s->status = READY_STAT | SEEK_STAT; sector_num = ide_get_sector(s); @@ -912,6 +878,7 @@ static void ide_sector_write(IDEState *s) n = s->nsector; if (n > s->req_nb_sectors) n = s->req_nb_sectors; + ret = bdrv_write(s->bs, sector_num, s->io_buffer, n); s->nsector -= n; if (s->nsector == 0) { /* no more sectors to write */ @@ -924,8 +891,21 @@ static void ide_sector_write(IDEState *s) } ide_set_sector(s, sector_num + n); - bm->aiocb = bdrv_aio_write(s->bs, sector_num, s->io_buffer, n, - ide_sector_write_aio_cb, bm); +#ifdef TARGET_I386 + if (win2k_install_hack && ((++s->irq_count % 16) == 0)) { + /* It seems there is a bug in the Windows 2000 installer HDD + IDE driver which fills the disk with empty logs when the + IDE write IRQ comes too early. This hack tries to correct + that at the expense of slower write performances. Use this + option _only_ to install Windows 2000. You must disable it + for normal use. */ + qemu_mod_timer(s->sector_write_timer, + qemu_get_clock(vm_clock) + (ticks_per_sec / 1000)); + } else +#endif + { + ide_set_irq(s); + } } /* XXX: handle errors */ |