aboutsummaryrefslogtreecommitdiff
path: root/scripts/qapi.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-29 13:39:04 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-29 13:39:04 +0100
commitac8076ac8638428e2a96d5f6c7e80f2014f9e379 (patch)
treea6e38f0da9323a58408c44070ea97b526c0a6f14 /scripts/qapi.py
parent76fbbec9315f8712d921411fbb4dad1fbcf1b151 (diff)
parenta22d8e47f7efb15a96162b92b50f8fb108b1c5d9 (diff)
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 'scripts/qapi.py')
-rw-r--r--scripts/qapi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 54b97cb48e..f2c6d1f840 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -255,7 +255,7 @@ def check_event(expr, expr_info):
if structured:
raise QAPIExprError(expr_info,
"Nested structure define in event is not "
- "supported now, event '%s', argname '%s'"
+ "supported, event '%s', argname '%s'"
% (expr['event'], argname))
def check_union(expr, expr_info):