summary refs log tree commit diff stats
path: root/docs/qapi-code-gen.txt
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-16 10:14:33 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-16 10:14:33 +0000
commitbc7c6c1fec2e9aa1ff6f2e018ed641db1429315c (patch)
tree3755dde8066f28799faeda6ffe6f49f168f03736 /docs/qapi-code-gen.txt
parent8337c6cbc37c6b2184f41bab3eaff47d5e68012a (diff)
parent917158dc3b22924922dc1f3b9d4049a4fc83d926 (diff)
downloadfocaccia-qemu-bc7c6c1fec2e9aa1ff6f2e018ed641db1429315c.tar.gz
focaccia-qemu-bc7c6c1fec2e9aa1ff6f2e018ed641db1429315c.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri 13 Nov 2015 20:16:21 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  qtest/ahci: use raw format when qemu-img is absent
  libqos: add qemu-img presence check
  qtest/ahci: always specify image format
  ahci/qtest: don't use tcp sockets for migration tests
  atapi: Prioritize unknown cmd error over BCL error
  atapi: add byte_count_limit helper

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/qapi-code-gen.txt')
0 files changed, 0 insertions, 0 deletions