diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-29 11:01:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-29 11:01:38 +0100 |
| commit | aa2aac51f0f888b9a4a4fd461d5816ad84a1c448 (patch) | |
| tree | cace533d438452dc14a833bb32cd827875a2d193 | |
| parent | 21a21b853a1bb606358af61e738abfb9aecbd720 (diff) | |
| parent | 87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f (diff) | |
| download | qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.zip qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.tar.gz qemu-aa2aac51f0f888b9a4a4fd461d5816ad84a1c448.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Thu 28 Jul 2016 23:50:37 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:
ide: fix halted IO segfault at reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/ide/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 081c9eb..d117b7c 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -823,6 +823,7 @@ static void ide_dma_cb(void *opaque, int ret) } if (ret < 0) { if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) { + s->bus->dma->aiocb = NULL; return; } } |