aboutsummaryrefslogtreecommitdiff
path: root/hw/ide
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2016-08-05 08:30:02 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-08-09 14:24:25 -0500
commitff71767e069f26fa617047c38c8eb65673c8ad16 (patch)
tree6a92053d169876bf650572b44152a04d7aa1f6cc /hw/ide
parentec211e742683d4bc187839b01a4b0056617681a1 (diff)
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> (cherry picked from commit 16275edb342342625cd7e7ac2048436474465b50) Conflicts: hw/ide/macio.c * removed context dependancy on ddd495e5 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw/ide')
-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 76256eb8a8..664328d174 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -275,6 +275,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
/* Non-block ATAPI transfer - just copy to RAM */
s->io_buffer_size = MIN(s->io_buffer_size, io->len);
cpu_physical_memory_write(io->addr, s->io_buffer, s->io_buffer_size);
+ io->len = 0;
ide_atapi_cmd_ok(s);
m->dma_active = false;
goto done;