From patchwork Mon May 4 15:05:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 467633 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 A82DB140295 for ; Tue, 5 May 2015 01:09:21 +1000 (AEST) Received: from localhost ([::1]:34582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpHzj-0002O3-Dg for incoming@patchwork.ozlabs.org; Mon, 04 May 2015 11:09:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpHwX-0005P5-6U for qemu-devel@nongnu.org; Mon, 04 May 2015 11:06:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpHwV-0000NM-W3 for qemu-devel@nongnu.org; Mon, 04 May 2015 11:06:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpHwV-0000N8-OU for qemu-devel@nongnu.org; Mon, 04 May 2015 11:05:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t44F5wmI019820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 May 2015 11:05:58 -0400 Received: from red.redhat.com (ovpn-113-25.phx2.redhat.com [10.3.113.25]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t44F5dIq018431; Mon, 4 May 2015 11:05:57 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 4 May 2015 09:05:28 -0600 Message-Id: <1430751937-17523-32-git-send-email-eblake@redhat.com> In-Reply-To: <1430751937-17523-1-git-send-email-eblake@redhat.com> References: <1430751937-17523-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, berto@igalia.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH v8 31/40] qapi: Forbid 'type' in schema 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 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 ff337c2..ff53360 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'])