summary refs log tree commit diff stats
path: root/hw/ide/macio.c
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2016-08-05 08:30:02 +0100
committerDavid Gibson <david@gibson.dropbear.id.au>2016-08-08 09:45:03 +1000
commit16275edb342342625cd7e7ac2048436474465b50 (patch)
treed63342e1280abd7f87def93b0b3cf3519bdac42a /hw/ide/macio.c
parent3c0c47e3464f3c54bd3f1cc6d4da2cbf7465e295 (diff)
downloadfocaccia-qemu-16275edb342342625cd7e7ac2048436474465b50.tar.gz
focaccia-qemu-16275edb342342625cd7e7ac2048436474465b50.zip
macio: set res_count value to 0 after non-block ATAPI DMA transfers
res_count should be set to the number of outstanding bytes after a DBDMA
request. Unfortunately this wasn't being set to zero by the non-block
transfer codepath meaning drivers that checked the descriptor result for
such requests (e.g reading the CDROM TOC) would assume from a non-zero result
that the transfer had failed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ide/macio.c')
-rw-r--r--hw/ide/macio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 5a326afd96..76f97c2539 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -273,6 +273,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
         s->io_buffer_size = MIN(s->io_buffer_size, io->len);
         dma_memory_write(&address_space_memory, io->addr, s->io_buffer,
                          s->io_buffer_size);
+        io->len = 0;
         ide_atapi_cmd_ok(s);
         m->dma_active = false;
         goto done;