From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Aug 2019 11:32:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f3a972e225600d76c673ed23da2bcb07f27aa4d;p=qemu.git

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>
---

9f3a972e225600d76c673ed23da2bcb07f27aa4d