diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-05-05 18:22:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-05-05 18:22:12 +0100 |
| commit | 233353ec93e4541fa7ab1c53a922a6d5c2bfce7a (patch) | |
| tree | 39ff570f5e091ca43323e7270f80bb9176a9907f /scripts/qapi-event.py | |
| parent | 874e9aeeeb74c5459639a93439a502d262847e68 (diff) | |
| parent | ff55d72eaf9628e7d58e7b067b361cdbf789c9f4 (diff) | |
| download | focaccia-qemu-233353ec93e4541fa7ab1c53a922a6d5c2bfce7a.tar.gz focaccia-qemu-233353ec93e4541fa7ab1c53a922a6d5c2bfce7a.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qmp-2015-05-05' into staging
drop qapi nested structs # gpg: Signature made Tue May 5 17:40:40 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" * remotes/armbru/tags/pull-qmp-2015-05-05: (40 commits) qapi: Check for member name conflicts with a base class qapi: Support (subset of) \u escapes in strings qapi: Tweak doc references to QMP when QGA is also meant qapi: Drop dead visitor code related to nested structs qapi: Drop support for inline nested types qapi: Drop inline nested structs in query-pci qapi: Drop inline nested struct in query-version qapi: Drop tests for inline nested structs qapi: Merge UserDefTwo and UserDefNested in tests qapi: Forbid 'type' in schema qapi: Use 'struct' instead of 'type' in schema qapi: Document 'struct' metatype qapi: Prefer 'struct' over 'type' in generator qapi: More rigorous checking for type safety bypass qapi: Whitelist commands that don't return dictionary qapi: Require valid names qapi: More rigourous checking of types qapi: Add some type check tests qapi: Unify type bypass and add tests qapi: Allow true, false and null in schema json ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi-event.py')
| -rw-r--r-- | scripts/qapi-event.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 601e3076ab..47dc041805 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -21,7 +21,7 @@ def _generate_event_api_name(event_name, params): l = len(api_name) if params: - for argname, argentry, optional, structured in parse_args(params): + for argname, argentry, optional in parse_args(params): if optional: api_name += "bool has_%s,\n" % c_var(argname) api_name += "".ljust(l) @@ -93,7 +93,7 @@ def generate_event_implement(api_name, event_name, params): """, event_name = event_name) - for argname, argentry, optional, structured in parse_args(params): + for argname, argentry, optional in parse_args(params): if optional: ret += mcgen(""" if (has_%(var)s) { |