-----BEGIN PGP SIGNATURE-----

Version: GnuPG v1
 
 iQIcBAABAgAGBQJXqfsUAAoJEH3vgQaq/DkOxfMQAMLgajM9QEJpxb0ARrY9z/20
 XWvBIp6fgBgmOU3adPcelJE1gI1J9Ngzlyef2Cb1WQbg5+e8NCqO0UM/1zij87yZ
 GySnxadkxXSkaR6Lb/7XeB5S/J1njEVU75aklZotXi0APtJKAgjYIrYi6VQgAmvX
 eUfwxv5iV5xsSd0MFSxzWTqhI/Z69F8lKX0clENTf2FY8ngAH+qznEgBKAdHF6WA
 iYUTdICp+XltiYlh61LLJ2DyLYDV/3FlVgz5c/fpZNlKRLQ9oaZNiwdH+WbQxAlB
 bMQGmEEzofz7rIPZ+2Xw1NYUx9HswVFrglti5Y3F1ojBkwXFVrj2bERe5+G2+z5K
 jltn/zqks5uultOB3LTMc4ActVIPhB3Zjeuctt7KCMfxuXYSeZCyIQ/055co3mG+
 q8KeaVMJtCHowdYDavY9aQpi1dmVTwaEVcw6DlHhQ4BeF1fgFPlR3KiaOC0Dz5Zt
 lZW6VnRA6vAkfC1f7vHwtdJiboSPRhVAtiDPz+Yv2qdCJpgDlc+r/8K4YLgxDWIx
 LExm1rp0oaH1x9ul5Qmxn0WFv3tSBtEc0gywKnT4gVAO/VS8xmNbq7zLd9aGKUXY
 TZ9yFEuPHVpp/qBkHJRoTlhn73Eg/TIohSIhuqL3kYIRO3tSZKcNcY3PRra2RyvH
 8GNvdceIya6adOlKN8e+
 =8UoB
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Tue 09 Aug 2016 16:47:32 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  atapi: fix halted DMA reset

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

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;