qapi script: clean up in scripts

This patch improve docs and uses c_type(argentry, is_param=True)
in script.

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Wenchao Xia 2014-06-24 16:33:59 -07:00 committed by Luiz Capitulino
parent 1dbbe04525
commit d6f9c82c62
4 changed files with 8 additions and 9 deletions

View file

@ -218,10 +218,10 @@ An example command is:
=== Events === === Events ===
Events are defined with the keyword 'event'. When 'data' is also specified, Events are defined with the keyword 'event'. When 'data' is also specified,
additional info will be carried on. Finally there will be C API generated additional info will be included in the event. Finally there will be C API
in qapi-event.h; when called by QEMU code, a message with timestamp will generated in qapi-event.h; when called by QEMU code, a message with timestamp
be emitted on the wire. If timestamp is -1, it means failure to retrieve host will be emitted on the wire. If timestamp is -1, it means failure to retrieve
time. host time.
An example event is: An example event is:

View file

@ -26,9 +26,8 @@ def _generate_event_api_name(event_name, params):
api_name += "bool has_%s,\n" % c_var(argname) api_name += "bool has_%s,\n" % c_var(argname)
api_name += "".ljust(l) api_name += "".ljust(l)
if argentry == "str": api_name += "%s %s,\n" % (c_type(argentry, is_param=True),
api_name += "const " c_var(argname))
api_name += "%s %s,\n" % (c_type(argentry), c_var(argname))
api_name += "".ljust(l) api_name += "".ljust(l)
api_name += "Error **errp)" api_name += "Error **errp)"

View file

@ -255,7 +255,7 @@ def check_event(expr, expr_info):
if structured: if structured:
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
"Nested structure define in event is not " "Nested structure define in event is not "
"supported now, event '%s', argname '%s'" "supported, event '%s', argname '%s'"
% (expr['event'], argname)) % (expr['event'], argname))
def check_union(expr, expr_info): def check_union(expr, expr_info):

View file

@ -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'