summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPeter Maydell2014-06-29 14:39:04 +0200
committerPeter Maydell2014-06-29 14:39:04 +0200
commitac8076ac8638428e2a96d5f6c7e80f2014f9e379 (patch)
treea6e38f0da9323a58408c44070ea97b526c0a6f14 /tests
parentMerge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st... (diff)
parentdocs/qmp: Fix documentation of BLOCK_JOB_READY to match code (diff)
downloadqemu-ac8076ac8638428e2a96d5f6c7e80f2014f9e379.tar.gz
qemu-ac8076ac8638428e2a96d5f6c7e80f2014f9e379.tar.xz
qemu-ac8076ac8638428e2a96d5f6c7e80f2014f9e379.zip
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp: docs/qmp: Fix documentation of BLOCK_JOB_READY to match code char: report frontend open/closed state in 'query-chardev' virtio-serial: report frontend connection state via monitor qmp: add qmp-events.txt back qapi event: clean up in callers qapi script: clean up in scripts qapi: ignore generated event files qapi: move event defines Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/qapi-schema/event-nest-struct.err2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/event-nest-struct.err b/tests/qapi-schema/event-nest-struct.err
index e4a0faac9c..91bde1c967 100644
--- a/tests/qapi-schema/event-nest-struct.err
+++ b/tests/qapi-schema/event-nest-struct.err
@@ -1 +1 @@
-tests/qapi-schema/event-nest-struct.json:1: Nested structure define in event is not supported now, event 'EVENT_A', argname 'a'
+tests/qapi-schema/event-nest-struct.json:1: Nested structure define in event is not supported, event 'EVENT_A', argname 'a'