From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 28 Jan 2020 17:09:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
X-Git-Tag: v5.0.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bddff6f6787c916b0e9d63ef9e4d442114257739;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

Pull request

# gpg: Signature made Tue 28 Jan 2020 01:05:19 GMT
# 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:
  tests/ide-test: Create a single unit-test covering more PRDT cases
  ide: Fix incorrect handling of some PRDTs in ide_dma_cb()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

bddff6f6787c916b0e9d63ef9e4d442114257739