summary refs log tree commit diff stats
path: root/qapi/string-input-visitor.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-15 18:01:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-15 18:01:47 +0100
commitba43bc25c9793ae57d7b5539fecc26015a96107f (patch)
treed12167b0f2c198436028e728d410379d23d1c3cb /qapi/string-input-visitor.c
parent895527eea5e57695f76c5e41def531d7f1d80917 (diff)
parent937251408051e0489f78e4db3c92e045b147b38b (diff)
downloadfocaccia-qemu-ba43bc25c9793ae57d7b5539fecc26015a96107f.tar.gz
focaccia-qemu-ba43bc25c9793ae57d7b5539fecc26015a96107f.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio update

looks like a quiet week
minor bugfix in virtio by myself

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 13 May 2014 14:37:23 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  virtio: allow mapping up to max queue size

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