mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cancel IDE outstanding IO on device reset (Gleb Natapov)

Browse Source 
Cancel AIO in IDE layer on device rest in order to be in deterministic state
during next boot.

Signed-off-by: Gleb Natapov <gleb@qumranet.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5011 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-08-15 18:21:58 +00:00
parent 414f0dab09
commit 72c7b06cb7
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/ide.c
View File

@ -2844,14 +2844,8 @@ static void ide_dma_start(IDEState *s, BlockDriverCompletionFunc *dma_cb)
} }
} }
static void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val) static void ide_dma_cancel(BMDMAState *bm)
{ {
BMDMAState *bm = opaque;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
if (!(val & BM_CMD_START)) {
/* XXX: do it better */
if (bm->status & BM_STATUS_DMAING) { if (bm->status & BM_STATUS_DMAING) {
bm->status &= ~BM_STATUS_DMAING; bm->status &= ~BM_STATUS_DMAING;
/* cancel DMA request */ /* cancel DMA request */
@ -2865,6 +2859,17 @@ static void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
bm->aiocb = NULL; bm->aiocb = NULL;
} }
} }
}
static void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
{
BMDMAState *bm = opaque;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
if (!(val & BM_CMD_START)) {
/* XXX: do it better */
ide_dma_cancel(bm);
bm->cmd = val & 0x09; bm->cmd = val & 0x09;
} else { } else {
if (!(bm->status & BM_STATUS_DMAING)) { if (!(bm->status & BM_STATUS_DMAING)) {
@ -3188,9 +3193,14 @@ static int pci_ide_load(QEMUFile* f, void *opaque, int version_id)
return 0; return 0;
} }
static void piix3_reset(PCIIDEState *d) static void piix3_reset(void *opaque)
{ {
PCIIDEState *d = opaque;
uint8_t *pci_conf = d->dev.config; uint8_t *pci_conf = d->dev.config;
int i;
for (i = 0; i < 2; i++)
ide_dma_cancel(&d->bmdma[i]);
pci_conf[0x04] = 0x00; pci_conf[0x04] = 0x00;
pci_conf[0x05] = 0x00; pci_conf[0x05] = 0x00;
@ -3224,6 +3234,7 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
pci_conf[0x0b] = 0x01; // class_base = PCI_mass_storage pci_conf[0x0b] = 0x01; // class_base = PCI_mass_storage
pci_conf[0x0e] = 0x00; // header_type pci_conf[0x0e] = 0x00; // header_type
qemu_register_reset(piix3_reset, d);
piix3_reset(d); piix3_reset(d);
pci_register_io_region((PCIDevice *)d, 4, 0x10, pci_register_io_region((PCIDevice *)d, 4, 0x10,
@ -3262,6 +3273,7 @@ void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
pci_conf[0x0b] = 0x01; // class_base = PCI_mass_storage pci_conf[0x0b] = 0x01; // class_base = PCI_mass_storage
pci_conf[0x0e] = 0x00; // header_type pci_conf[0x0e] = 0x00; // header_type
qemu_register_reset(piix3_reset, d);
piix3_reset(d); piix3_reset(d);
pci_register_io_region((PCIDevice *)d, 4, 0x10, pci_register_io_region((PCIDevice *)d, 4, 0x10,