diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-22 17:08:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-22 17:08:58 +0100 |
| commit | 7ed14cbf3cf083f125c079bd02b3215941853830 (patch) | |
| tree | a845e5314ea1b5af5aa4a4b9c9af7d9c2aa9605c /scripts/qapi/types.py | |
| parent | 5fce31220003bbe1b4c7faa0dbf92d131b0a413b (diff) | |
| parent | be25fcc4d2faeb3ffa8db813272963bae659c4c2 (diff) | |
| download | qemu-7ed14cbf3cf083f125c079bd02b3215941853830.zip qemu-7ed14cbf3cf083f125c079bd02b3215941853830.tar.gz qemu-7ed14cbf3cf083f125c079bd02b3215941853830.tar.bz2 | |
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/types.py')
| -rw-r--r-- | scripts/qapi/types.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 64d9c0f..a599352 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -125,6 +125,8 @@ def gen_variants(variants): c_name=c_name(variants.tag_member.name)) for var in variants.variants: + if var.type.name == 'q_empty': + continue ret += mcgen(''' %(c_type)s %(c_name)s; ''', |