From: Peter Maydell Date: Thu, 11 Feb 2016 13:02:28 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f16368459957603b8b3efa83353cc7e13ab6abd3;p=qemu.git 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) " * 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 --- f16368459957603b8b3efa83353cc7e13ab6abd3