diff options
| author | Peter Maydell | 2018-06-22 18:08:57 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-22 18:08:58 +0200 |
| commit | 7ed14cbf3cf083f125c079bd02b3215941853830 (patch) | |
| tree | a845e5314ea1b5af5aa4a4b9c9af7d9c2aa9605c /scripts/qapi/events.py | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180622'... (diff) | |
| parent | MAINTAINERS: Update QAPI stanza for commit fb0bc835e56 (diff) | |
| download | qemu-7ed14cbf3cf083f125c079bd02b3215941853830.tar.gz qemu-7ed14cbf3cf083f125c079bd02b3215941853830.tar.xz qemu-7ed14cbf3cf083f125c079bd02b3215941853830.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-06-22' into staging
QAPI patches for 2018-06-22
# gpg: Signature made Fri 22 Jun 2018 15:36:22 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2018-06-22:
MAINTAINERS: Update QAPI stanza for commit fb0bc835e56
qapi/introspect: Eliminate pointless variable in .visit_end()
Revert commit d4e5ec877ca
qapi: Open files with encoding='utf-8'
qapi: remove empty flat union branches and types
qapi: allow empty branches in flat unions
tests: Add QDict clone-flatten test
qdict: Make qdict_flatten() shallow-clone-friendly
qapi/events: generate event enum in main module
qapi/visit: remove useless prefix argument
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi/events.py')
| -rw-r--r-- | scripts/qapi/events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 4426861ff1..5657524688 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -180,8 +180,9 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor): types=types)) def visit_end(self): - self._genh.add(gen_enum(self._enum_name, self._event_names)) - self._genc.add(gen_enum_lookup(self._enum_name, self._event_names)) + (genc, genh) = self._module[self._main_module] + genh.add(gen_enum(self._enum_name, self._event_names)) + genc.add(gen_enum_lookup(self._enum_name, self._event_names)) def visit_event(self, name, info, arg_type, boxed): self._genh.add(gen_event_send_decl(name, arg_type, boxed)) |