From patchwork Wed Dec 2 05:20:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 551156 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 0A05D140291 for ; Wed, 2 Dec 2015 16:21:36 +1100 (AEDT) Received: from localhost ([::1]:56174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3zrC-00006G-1E for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2015 00:21:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3zql-0007kq-Ll for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3zqk-0007PJ-IF for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3zqk-0007Os-Dl for qemu-devel@nongnu.org; Wed, 02 Dec 2015 00:21:06 -0500 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 066B9C0CC642; Wed, 2 Dec 2015 05:21:06 +0000 (UTC) Received: from red.redhat.com (ovpn-113-144.phx2.redhat.com [10.3.113.144]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB25L2Rf018809; Wed, 2 Dec 2015 00:21:05 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2015 22:20:50 -0700 Message-Id: <1449033659-25497-7-git-send-email-eblake@redhat.com> In-Reply-To: <1449033659-25497-1-git-send-email-eblake@redhat.com> References: <1449033659-25497-1-git-send-email-eblake@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: armbru@redhat.com, Michael Roth Subject: [Qemu-devel] [PATCH v14 06/15] qapi: Inline _make_implicit_tag() 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 Now that alternates no longer use an implicit tag, we can inline _make_implicit_tag() into its one caller, _def_union_type(). No change to generated code. Suggested-by: Markus Armbruster Signed-off-by: Eric Blake --- v14: no change v13: commit message touchup v12: new patch --- scripts/qapi.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 44b6126..264de63 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1318,11 +1318,6 @@ class QAPISchema(object): typ, info, 'wrapper', [self._make_member('data', typ, info)]) return QAPISchemaObjectTypeVariant(case, typ) - def _make_implicit_tag(self, type_name, info, variants): - typ = self._make_implicit_enum_type(type_name, info, - [v.name for v in variants]) - return QAPISchemaObjectTypeMember('type', typ, False) - def _def_union_type(self, expr, info): name = expr['union'] data = expr['data'] @@ -1336,7 +1331,9 @@ class QAPISchema(object): else: variants = [self._make_simple_variant(key, value, info) for (key, value) in data.iteritems()] - tag_member = self._make_implicit_tag(name, info, variants) + typ = self._make_implicit_enum_type(name, info, + [v.name for v in variants]) + tag_member = QAPISchemaObjectTypeMember('type', typ, False) members = [tag_member] self._def_entity( QAPISchemaObjectType(name, info, base, members,