diff options
| author | John Snow <jsnow@redhat.com> | 2016-07-28 17:34:19 -0400 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-08-05 16:59:20 -0500 |
| commit | 16a87c4a5d146a9a862c6095a689ec58a6081294 (patch) | |
| tree | 283a2997111dfc77660f787d2f9ab7feb718900b /hw/ide | |
| parent | 86cc089aa7251a6ce54e54458ed29a7867e69290 (diff) | |
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>
(cherry picked from commit 87ac25fd1fed05a30a93d27dbeb2a4c4b83ec95f)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw/ide')
| -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 41e6a2dc45..e87dc573ea 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -806,6 +806,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; } } |