From patchwork Fri Jun 12 14:51:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 483641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C5F11140285 for ; Sat, 13 Jun 2015 00:55:41 +1000 (AEST) Received: from localhost ([::1]:51931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QMt-0003VT-Vn for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 10:55:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIn-0003cB-9Y for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3QIl-0001l2-KF for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIl-0001kl-Ea for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:23 -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 085AE2F1484; Fri, 12 Jun 2015 14:51:23 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5CEpJC2012174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Jun 2015 10:51:22 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AF23C303E3DC; Fri, 12 Jun 2015 16:51:15 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 16:51:10 +0200 Message-Id: <1434120674-8122-13-git-send-email-armbru@redhat.com> In-Reply-To: <1434120674-8122-1-git-send-email-armbru@redhat.com> References: <1434120674-8122-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 12/16] qapi: Catch and reject flat union branch of array type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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