summary refs log tree commit diff stats
path: root/scripts/qapi.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-10-12 15:52:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-10-12 15:52:54 +0100
commit5451316ed07b758a187dedf21047bed8f843f7f1 (patch)
tree260f6ddf72d36b2f492628648c845ecdac7dbc0e /scripts/qapi.py
parent0bf224d5da41967a775b328234cda2d19f303908 (diff)
parent9201bb9a8c7cd3ba2382b7db5b2e40f603e61528 (diff)
downloadfocaccia-qemu-5451316ed07b758a187dedf21047bed8f843f7f1.tar.gz
focaccia-qemu-5451316ed07b758a187dedf21047bed8f843f7f1.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request

v2:
 * Fix virtio 16lx -> HWADDR_PRIx format specifier [Peter]

# gpg: Signature made Mon 12 Oct 2015 11:19:06 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  sdhci.c: Limit the maximum block size
  block: switch from g_slice allocator to malloc
  virtio dataplane: adapt dataplane for virtio Version 1
  virtio-blk: use blk_io_plug/unplug for Linux AIO batching
  sdhci: Pass drive parameter to sdhci-pci via qdev property

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