OSDN Git Service

Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-23' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Mar 2018 17:41:56 +0000 (17:41 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Mar 2018 17:41:56 +0000 (17:41 +0000)
commit66793daa03f38af64cbed3a54c1059d03d48aea7
treecb47365920d9ed7ca8129e118b533822011bfc1b
parent4c2c1015905fa1d616750dfe024b4c0b35875950
parent39615354fc07af34e04ab5efb5b6d478b0d24e32
Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-23' into staging

qapi patches for 2018-03-12, 2.12-rc1

- Peter Xu: 0/4 Turn OOB off for 2.12-rc1, revert OOB tests
- Eric Blake: qapi: Force UTF8 encoding when parsing qapi files

# gpg: Signature made Fri 23 Mar 2018 17:35:49 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-qapi-2018-03-23:
  qapi: Force UTF8 encoding when parsing qapi files
  Revert "monitor: enable IO thread for (qmp & !mux) typed"
  Revert "tests: qmp-test: verify command batching"
  Revert "tests: qmp-test: add oob test"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>