aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2016-07-28 17:34:19 -0400
committerJohn Snow <jsnow@redhat.com>2016-07-28 17:34:19 -0400
commit87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f (patch)
treecace533d438452dc14a833bb32cd827875a2d193
parent21a21b853a1bb606358af61e738abfb9aecbd720 (diff)
downloadqemu-87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f.zip
qemu-87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f.tar.gz
qemu-87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f.tar.bz2
ide: fix halted IO segfault at reset
If one attempts to perform a system_reset after a failed IO request that causes the VM to enter a paused state, QEMU will segfault trying to free up the pending IO requests. These requests have already been completed and freed, though, so all we need to do is NULL them before we enter the paused state. Existing AHCI tests verify that halted requests are still resumed successfully after a STOP event. Analyzed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 1469635201-11918-2-git-send-email-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
-rw-r--r--hw/ide/core.c1
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;
}
}