From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Ysp-0000IQ-GI for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Ysn-0007ki-2A for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Ysm-0007kQ-Sw for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 8DC8EC12F8 for ; Thu, 18 Jun 2015 12:25:24 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5ICPMJq026202 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 18 Jun 2015 08:25:24 -0400 From: Markus Armbruster Date: Thu, 18 Jun 2015 14:25:14 +0200 Message-Id: <1434630318-22452-12-git-send-email-armbru@redhat.com> In-Reply-To: <1434630318-22452-1-git-send-email-armbru@redhat.com> References: <1434630318-22452-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 11/15] qapi: Catch and reject flat union branch of array type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi.py | 2 +- tests/qapi-schema/flat-union-array-branch.err | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 8f23267..06d7fc2 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -580,7 +580,7 @@ def check_union(expr, expr_info): # Each value must name a known type; furthermore, in flat unions, # branches must be a struct with no overlapping member names check_type(expr_info, "Member '%s' of union '%s'" % (key, name), - value, allow_array=True, allow_metas=allow_metas) + value, allow_array=not base, allow_metas=allow_metas) if base: branch_struct = find_struct(value) assert branch_struct diff --git a/tests/qapi-schema/flat-union-array-branch.err b/tests/qapi-schema/flat-union-array-branch.err index b45ef43..8ea91ea 100644 --- a/tests/qapi-schema/flat-union-array-branch.err +++ b/tests/qapi-schema/flat-union-array-branch.err @@ -1,10 +1 @@ -Traceback (most recent call last): - File "tests/qapi-schema/test-qapi.py", line 19, in - exprs = parse_schema(sys.argv[1]) - File "scripts/qapi.py", line 760, in parse_schema - return check_exprs(schema.exprs) - File "scripts/qapi.py", line 743, in check_exprs - check_union(expr, info) - File "scripts/qapi.py", line 586, in check_union - assert branch_struct -AssertionError +tests/qapi-schema/flat-union-array-branch.json:8: Member 'value1' of union 'TestUnion' cannot be an array -- 1.9.3