From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMYMe-000422-Op for qemu-devel@nongnu.org; Tue, 04 Aug 2015 05:18:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMYMa-0007RN-D0 for qemu-devel@nongnu.org; Tue, 04 Aug 2015 05:18:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMYMa-0007Pi-3K for qemu-devel@nongnu.org; Tue, 04 Aug 2015 05:18:24 -0400 From: Markus Armbruster Date: Tue, 4 Aug 2015 11:18:10 +0200 Message-Id: <1438679896-5077-21-git-send-email-armbru@redhat.com> In-Reply-To: <1438679896-5077-1-git-send-email-armbru@redhat.com> References: <1438679896-5077-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 20/26] qapi: Fix to reject union command and event arguments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com A command's or event'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 and qapi-events.py for it. Signed-off-by: Markus Armbruster --- scripts/qapi.py | 4 ++-- 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, 5 insertions(+), 8 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index e61db30..ec7923a 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -499,7 +499,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'] @@ -517,7 +517,7 @@ def check_event(expr, expr_info): events.append(name) check_type(expr_info, "'data' for event '%s'" % name, expr.get('data'), allow_dict=True, allow_optional=True, - allow_metas=['union', 'struct']) + allow_metas=['struct']) def check_union(expr, expr_info): name = expr['union'] 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}] -[] -- 2.4.3