summary refs log tree commit diff stats
path: root/backends/hostmem-file.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-04-13 16:32:28 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-13 16:32:29 +0100
commitc0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b (patch)
tree8aed873d0e5859db34e6a8d335367e26f15efb4a /backends/hostmem-file.c
parentd44122ecd0fa62d20762bdd8f214f077cb8e011b (diff)
parent502356eeeb5fd2bdd92b2d5156e511626c1c3814 (diff)
downloadfocaccia-qemu-c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b.tar.gz
focaccia-qemu-c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b.zip
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>
Diffstat (limited to 'backends/hostmem-file.c')
0 files changed, 0 insertions, 0 deletions