diff options
| author | Peter Maydell | 2016-08-09 17:53:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-09 17:53:32 +0200 |
| commit | 2bb15bddf2607110820d5ce5aa43baac27292fb3 (patch) | |
| tree | 5e9722a117865138d73691eaa41e022ec2fa0730 /hw/ide/atapi.c | |
| parent | Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into st... (diff) | |
| parent | atapi: fix halted DMA reset (diff) | |
| download | qemu-2bb15bddf2607110820d5ce5aa43baac27292fb3.tar.gz qemu-2bb15bddf2607110820d5ce5aa43baac27292fb3.tar.xz qemu-2bb15bddf2607110820d5ce5aa43baac27292fb3.zip | |
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>
Diffstat (limited to 'hw/ide/atapi.c')
| -rw-r--r-- | hw/ide/atapi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 95056d92e7..6189675036 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; |