From: John Snow <jsnow@redhat.com>
Date: Tue, 9 Aug 2016 15:47:23 +0000 (-0400)
Subject: atapi: fix halted DMA reset
X-Git-Tag: v2.6.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec211e742683d4bc187839b01a4b0056617681a1;p=thirdparty%2Fqemu.git

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>
(cherry picked from commit 7f951b2d7765f68ae1e563c2fed44071ca774790)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 2bb606c1c5c..8592a4ae17c 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -383,6 +383,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;