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>2017-11-10 17:25:15 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-11-10 17:25:15 +0000
commit53fb28d10da4eb41b77139f3458be08fb6f658e4 (patch)
treecf8dd5fce01edf4430267603d50553d6f1225ef0 /qapi/string-input-visitor.c
parent4ffa88c99c54d2a30f79e3dbecec50b023eff1c8 (diff)
parentef6dada8b44e1e7c4bec5c1115903af9af415b50 (diff)
downloadfocaccia-qemu-53fb28d10da4eb41b77139f3458be08fb6f658e4.tar.gz
focaccia-qemu-53fb28d10da4eb41b77139f3458be08fb6f658e4.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request

v2:
 * v1 emails 2/3 and 3/3 weren't sent due to an email failure
 * Included Sergio's updated wording in the commit description

# gpg: Signature made Wed 08 Nov 2017 19:12:01 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  util/async: use atomic_mb_set in qemu_bh_cancel
  tests-aio-multithread: fix /aio/multi/schedule race condition

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