aboutsummaryrefslogtreecommitdiff
path: root/hw/ide
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2016-08-09 11:47:23 -0400
committerJohn Snow <jsnow@redhat.com>2016-08-09 11:47:23 -0400
commit7f951b2d7765f68ae1e563c2fed44071ca774790 (patch)
tree5e9722a117865138d73691eaa41e022ec2fa0730 /hw/ide
parentab861f3915e8667927cf18ad97f71cae7ccf8818 (diff)
downloadqemu-7f951b2d7765f68ae1e563c2fed44071ca774790.zip
qemu-7f951b2d7765f68ae1e563c2fed44071ca774790.tar.gz
qemu-7f951b2d7765f68ae1e563c2fed44071ca774790.tar.bz2
atapi: fix halted DMA reset
Followup to 87ac25fd, this time for ATAPI DMA. Reported-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 1470164128-28158-1-git-send-email-jsnow@redhat.com Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/ide')
-rw-r--r--hw/ide/atapi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 95056d9..6189675 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -386,6 +386,7 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret)
if (ret < 0) {
if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) {
if (s->bus->error_status) {
+ s->bus->dma->aiocb = NULL;
return;
}
goto eot;