diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 13:02:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-11 13:02:28 +0000 |
| commit | f16368459957603b8b3efa83353cc7e13ab6abd3 (patch) | |
| tree | 70c7f9b03e7170f19a1ca0cb7c570bc07e04978b /exec.c | |
| parent | 36a9abd9be2f85c07e93378a5c5d1b180f5b2e15 (diff) | |
| parent | d590474922d37372c56075adb229c86d3aeae967 (diff) | |
| download | qemu-f16368459957603b8b3efa83353cc7e13ab6abd3.tar.gz qemu-f16368459957603b8b3efa83353cc7e13ab6abd3.tar.bz2 qemu-f16368459957603b8b3efa83353cc7e13ab6abd3.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Wed 10 Feb 2016 19:23:29 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
* remotes/jnsnow/tags/ide-pull-request:
ahci: prohibit "restarting" the FIS or CLB engines
ahci: explicitly reject bad engine states on post_load
ahci: handle LIST_ON and FIS_ON in map helpers
ahci: Do not unmap NULL addresses
fdc: always compile-check debug prints
ide: fix device_reset to not ignore pending AIO
ide: Add silent DRQ cancellation
ide: replace blk_drain_all by blk_drain
ide: move buffered DMA cancel to core
ide: code motion
ide: Prohibit RESET on IDE drives
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'exec.c')
0 files changed, 0 insertions, 0 deletions