Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging
commit49bcce4b9c11759678fd223aefb48691c4959d4f
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Jul 2017 15:56:06 +0000 (13 16:56 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 13 Jul 2017 15:56:06 +0000 (13 16:56 +0100)
treea497d6ce8488623426d5ff5e9a0c8758a3caea33
parentaa5a704756fe933d0c87c02657e4406866d36c1d
parent086ee7a6200fa5ad795b12110b5b3d5a93dcac3e
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging

QAPI patches for 2017-07-12

# gpg: Signature made Wed 12 Jul 2017 17:07:20 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-07-12:
  scripts: use build_ prefix for string not piped through cgen()
  qobject: Update coccinelle script to catch Q{INC, DEC}REF
  qobject: Catch another straggler for use of qdict_put_str()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
monitor.c
qemu-img.c