diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-13 16:32:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-13 16:32:29 +0100 |
| commit | c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b (patch) | |
| tree | 8aed873d0e5859db34e6a8d335367e26f15efb4a /tests/qapi-schema/redefined-command.json | |
| parent | d44122ecd0fa62d20762bdd8f214f077cb8e011b (diff) | |
| parent | 502356eeeb5fd2bdd92b2d5156e511626c1c3814 (diff) | |
| download | qemu-c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b.tar.gz | |
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 'tests/qapi-schema/redefined-command.json')
0 files changed, 0 insertions, 0 deletions