From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnRhw-0007y9-MV for qemu-devel@nongnu.org; Wed, 29 Apr 2015 09:07:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnRhs-00016D-7p for qemu-devel@nongnu.org; Wed, 29 Apr 2015 09:07:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnRhs-00015u-0B for qemu-devel@nongnu.org; Wed, 29 Apr 2015 09:07:16 -0400 From: Eric Blake Date: Wed, 29 Apr 2015 07:06:46 -0600 Message-Id: <1430312814-19706-32-git-send-email-eblake@redhat.com> In-Reply-To: <1430312814-19706-1-git-send-email-eblake@redhat.com> References: <1430312814-19706-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v7 31/39] qapi: Forbid 'type' in schema List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, armbru@redhat.com Referring to "type" as both a meta-type (built-in, enum, union, alternate, or struct) and a specific type (the name that the schema uses for declaring structs) is confusing. Finish up the conversion to using "struct" in qapi schema by removing the hack in the generator that allowed 'type'. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster --- v7: split from the previous patch --- scripts/qapi.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index c163b45..609a169 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -617,20 +617,6 @@ def parse_schema(input_file): for expr_elem in schema.exprs: expr = expr_elem['expr'] info = expr_elem['info'] - - # back-compat hack until all schemas have been converted; - # preserve the ordering of the original expression - if expr.has_key('type'): - seen_type = False - for (key, value) in expr.items(): - if key == 'type': - seen_type = True - del expr['type'] - expr['struct'] = value - elif seen_type: - del expr[key] - expr[key] = value - if expr.has_key('enum'): check_keys(expr_elem, 'enum', ['data']) add_enum(expr['enum'], info, expr['data']) -- 2.1.0