diff options
| author | Eric Blake <eblake@redhat.com> | 2016-07-13 21:50:16 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-19 13:21:08 +0200 |
| commit | b6167706829c6e0d3572daa2b6769594ced276f7 (patch) | |
| tree | 071a050bf00a620b128ac5c79efeb0796e6deb6f /scripts/qapi-types.py | |
| parent | da9cb19385fc66b2cb2584bbbbcbf50246d057e2 (diff) | |
| download | focaccia-qemu-b6167706829c6e0d3572daa2b6769594ced276f7.tar.gz focaccia-qemu-b6167706829c6e0d3572daa2b6769594ced276f7.zip | |
qapi: Add type.is_empty() helper
In the near future, we want to lift our artificial restriction of no variants at the top level of an event, at which point the currently open-coded check for empty members will become insufficient. Factor it out into a new helper method is_empty() now, and future-proof it by checking variants, too, along with an assert that it is not used prior to the completion of .check(). Update places that were checking for (non-)empty .members to use the new helper. All of the current callers assert that there are no variants (either directly, or by qapi.py asserting that base types have no variants), so this is not a semantic change. No change to generated code. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1468468228-27827-6-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts/qapi-types.py')
| -rw-r--r-- | scripts/qapi-types.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5ace2cf065..dabc42e047 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -91,7 +91,7 @@ struct %(c_name)s { # potential issues with attempting to malloc space for zero-length # structs in C, and also incompatibility with C++ (where an empty # struct is size 1). - if not (base and base.members) and not members and not variants: + if (not base or base.is_empty()) and not members and not variants: ret += mcgen(''' char qapi_dummy_for_empty_struct; ''') |