summaryrefslogtreecommitdiffstats
path: root/hw/arm/virt.c
diff options
context:
space:
mode:
authorPeter Maydell2018-03-23 18:41:56 +0100
committerPeter Maydell2018-03-23 18:41:56 +0100
commit66793daa03f38af64cbed3a54c1059d03d48aea7 (patch)
treecb47365920d9ed7ca8129e118b533822011bfc1b /hw/arm/virt.c
parentMerge remote-tracking branch 'remotes/borntraeger/tags/s390x-20180323' into s... (diff)
parentqapi: Force UTF8 encoding when parsing qapi files (diff)
downloadqemu-66793daa03f38af64cbed3a54c1059d03d48aea7.tar.gz
qemu-66793daa03f38af64cbed3a54c1059d03d48aea7.tar.xz
qemu-66793daa03f38af64cbed3a54c1059d03d48aea7.zip
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>
Diffstat (limited to 'hw/arm/virt.c')
0 files changed, 0 insertions, 0 deletions