From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 13 Apr 2016 15:32:28 +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=c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b;p=qemu.git

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

# gpg: Signature made Wed 13 Apr 2016 00:32:22 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  ide: really restart pending and in-flight atapi dma
  ide: restart atapi dma by re-evaluating command packet
  ide: don't lose pending dma state
  xen: Fix IDE unplug

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

c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b