| Message ID | 1435782155-31412-16-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/01/2015 02:22 PM, Markus Armbruster wrote: > A command's 'data' must be a struct type, given either as a > dictionary, or as struct type name. > > Commit dd883c6 tightened the checking there, but not enough: we still > accept 'union'. Fix to reject it. I was thinking that 'all dictionaries are okay' when I wrote that commit, and obviously missed thinking about 'how would we translate unions into a C prototype'. > > We may want to support union types there, but we'll have to extend > qapi-commands.py for it. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > scripts/qapi.py | 2 +- > tests/qapi-schema/args-union.err | 1 + > tests/qapi-schema/args-union.exit | 2 +- > tests/qapi-schema/args-union.json | 2 +- > tests/qapi-schema/args-union.out | 4 ---- > 5 files changed, 4 insertions(+), 7 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/scripts/qapi.py b/scripts/qapi.py > index 99e04f6..bebaecc 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -495,7 +495,7 @@ def check_command(expr, expr_info): > > check_type(expr_info, "'data' for command '%s'" % name, > expr.get('data'), allow_dict=True, allow_optional=True, > - allow_metas=['union', 'struct'], allow_star=allow_star) > + allow_metas=['struct'], allow_star=allow_star) I'm still quite pleased at how my earlier work made this a one-liner fix - the check_type() interface turned out to be rather pleasant.
diff --git a/scripts/qapi.py b/scripts/qapi.py index 99e04f6..bebaecc 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -495,7 +495,7 @@ def check_command(expr, expr_info): check_type(expr_info, "'data' for command '%s'" % name, expr.get('data'), allow_dict=True, allow_optional=True, - allow_metas=['union', 'struct'], allow_star=allow_star) + allow_metas=['struct'], allow_star=allow_star) returns_meta = ['union', 'struct'] if name in returns_whitelist: returns_meta += ['built-in', 'alternate', 'enum'] diff --git a/tests/qapi-schema/args-union.err b/tests/qapi-schema/args-union.err index e69de29..1d693d7 100644 --- a/tests/qapi-schema/args-union.err +++ b/tests/qapi-schema/args-union.err @@ -0,0 +1 @@ +tests/qapi-schema/args-union.json:4: 'data' for command 'oops' cannot use union type 'Uni' diff --git a/tests/qapi-schema/args-union.exit b/tests/qapi-schema/args-union.exit index 573541a..d00491f 100644 --- a/tests/qapi-schema/args-union.exit +++ b/tests/qapi-schema/args-union.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/args-union.json b/tests/qapi-schema/args-union.json index db97ef6..7bdcbb7 100644 --- a/tests/qapi-schema/args-union.json +++ b/tests/qapi-schema/args-union.json @@ -1,4 +1,4 @@ -# FIXME we should reject union arguments +# we do not allow union arguments # TODO should we support this? { 'union': 'Uni', 'data': { 'case1': 'int', 'case2': 'str' } } { 'command': 'oops', 'data': 'Uni' } diff --git a/tests/qapi-schema/args-union.out b/tests/qapi-schema/args-union.out index 907080c..e69de29 100644 --- a/tests/qapi-schema/args-union.out +++ b/tests/qapi-schema/args-union.out @@ -1,4 +0,0 @@ -[OrderedDict([('union', 'Uni'), ('data', OrderedDict([('case1', 'int'), ('case2', 'str')]))]), - OrderedDict([('command', 'oops'), ('data', 'Uni')])] -[{'enum_name': 'UniKind', 'enum_values': None}] -[]
A command's 'data' must be a struct type, given either as a dictionary, or as struct type name. Commit dd883c6 tightened the checking there, but not enough: we still accept 'union'. Fix to reject it. We may want to support union types there, but we'll have to extend qapi-commands.py for it. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- scripts/qapi.py | 2 +- tests/qapi-schema/args-union.err | 1 + tests/qapi-schema/args-union.exit | 2 +- tests/qapi-schema/args-union.json | 2 +- tests/qapi-schema/args-union.out | 4 ---- 5 files changed, 4 insertions(+), 7 deletions(-)