diff options
| author | Eric Blake <eblake@redhat.com> | 2015-05-04 09:05:33 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-05-05 18:39:02 +0200 |
| commit | 6b5abc7df7ef9aadb3ff0eba6ccf4f1f0181e2e1 (patch) | |
| tree | 1ad314b4514e5bd9951783b600ec3742d6ef0b70 /scripts/qapi-types.py | |
| parent | 9fa02cd194a131aca75ab646ece975b6835400e1 (diff) | |
| download | qemu-6b5abc7df7ef9aadb3ff0eba6ccf4f1f0181e2e1.tar.gz | |
qapi: Drop support for inline nested types
A future patch will be using a 'name':{dictionary} entry in the
QAPI schema to specify a default value for an optional argument
(see previous commit messages for more details why); but existing
use of inline nested structs conflicts with that goal. Now that
all commands have been changed to avoid inline nested structs,
nuke support for them, and turn it into a hard error. Update the
testsuite to reflect tighter parsing rules.
Signed-off-by: Eric Blake <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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index a429d9ec05..2bf8145076 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -63,18 +63,13 @@ typedef struct %(name)sList def generate_struct_fields(members): ret = '' - for argname, argentry, optional, structured in parse_args(members): + for argname, argentry, optional in parse_args(members): if optional: ret += mcgen(''' bool has_%(c_name)s; ''', c_name=c_var(argname)) - if structured: - push_indent() - ret += generate_struct({ "field": argname, "data": argentry}) - pop_indent() - else: - ret += mcgen(''' + ret += mcgen(''' %(c_type)s %(c_name)s; ''', c_type=c_type(argentry), c_name=c_var(argname)) |