diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-19 12:32:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-19 12:32:15 +0100 |
| commit | 9f3a972e225600d76c673ed23da2bcb07f27aa4d (patch) | |
| tree | b4b2c2b8c43c4b2b4d884db59ff38ab2940bf758 /hw/ide/ahci.c | |
| parent | 1f37316238d0d412cbc16482c5c24b11c2c7dcec (diff) | |
| parent | 614ab7d127536655ef105d4153ea264c88e855c1 (diff) | |
| download | focaccia-qemu-9f3a972e225600d76c673ed23da2bcb07f27aa4d.tar.gz focaccia-qemu-9f3a972e225600d76c673ed23da2bcb07f27aa4d.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
Pull request
Stable notes: patches one and two can be considered
for the next -stable release.
# gpg: Signature made Sat 17 Aug 2019 00:15:50 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# 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:
hw/ide/atapi: Use the ldst API
Revert "ide/ahci: Check for -ECANCELED in aio callbacks"
dma-helpers: ensure AIO callback is invoked after cancellation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/ahci.c')
| -rw-r--r-- | hw/ide/ahci.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index d72da85605..d45393c019 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1025,9 +1025,6 @@ static void ncq_cb(void *opaque, int ret) IDEState *ide_state = &ncq_tfs->drive->port.ifs[0]; ncq_tfs->aiocb = NULL; - if (ret == -ECANCELED) { - return; - } if (ret < 0) { bool is_read = ncq_tfs->cmd == READ_FPDMA_QUEUED; |