From patchwork Fri Jun 12 14:51:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 483639 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 7E03614029E for ; Sat, 13 Jun 2015 00:53:55 +1000 (AEST) Received: from localhost ([::1]:51913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QLB-0008Ly-Nz for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 10:53:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIm-0003c7-5q for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3QIh-0001iL-QL for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIh-0001hu-L8 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:19 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id ADF3C3674DF; Fri, 12 Jun 2015 14:51:18 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5CEpFXO030293 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Jun 2015 10:51:17 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2277F303F16B; Fri, 12 Jun 2015 16:51:15 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 16:51:02 +0200 Message-Id: <1434120674-8122-5-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.26 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 04/16] qapi: Eliminate superfluous QAPISchema attribute include_hist 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 683669e..baa60a5 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -110,7 +110,7 @@ class QAPISchema: if input_relname is None: input_relname = fp.name self.input_file = input_relname - self.include_hist = include_hist + [(input_relname, input_fname)] + include_hist = include_hist + [(input_relname, input_fname)] previously_included.append(input_fname) self.parent_info = parent_info self.src = fp.read() @@ -135,7 +135,7 @@ class QAPISchema: % include) include_path = os.path.join(os.path.dirname(input_fname), include) - for elem in self.include_hist: + for elem in include_hist: if include_path == elem[1]: raise QAPIExprError(expr_info, "Inclusion loop for %s" % include) @@ -147,7 +147,7 @@ class QAPISchema: except IOError, e: raise QAPIExprError(expr_info, '%s: %s' % (e.strerror, include)) - exprs_include = QAPISchema(fobj, include, self.include_hist, + exprs_include = QAPISchema(fobj, include, include_hist, previously_included, expr_info) self.exprs.extend(exprs_include.exprs) else: