[Qemu-devel] [PATCH 15/28] ide: stop PIO transfer on errors

[John Snow]

From: Paolo Bonzini <address@hidden>

This will provide a hook for sending the result of the command via the
FIS receive area.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
 hw/ide/core.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index bd3bd34..d900ba0 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -422,6 +422,9 @@ static inline void ide_abort_command(IDEState *s)
 {
     s->status = READY_STAT | ERR_STAT;
     s->error = ABRT_ERR;
+    if (s->end_transfer_func != ide_transfer_stop) {
+        ide_transfer_stop(s);
+    }
 }
 
 /* prepare data transfer and tell what to do after */
@@ -588,9 +591,7 @@ void ide_set_inactive(IDEState *s, bool more)
 
 void ide_dma_error(IDEState *s)
 {
-    ide_transfer_stop(s);
-    s->error = ABRT_ERR;
-    s->status = READY_STAT | ERR_STAT;
+    ide_abort_command(s);
     ide_set_inactive(s, false);
     ide_set_irq(s->bus);
 }
-- 
1.9.3