From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRO-00044p-L2 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtrRN-0006BU-G6 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRN-0006BM-AM for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:01 -0500 From: Eric Blake Date: Tue, 3 Nov 2015 23:20:39 -0700 Message-Id: <1446618049-13596-18-git-send-email-eblake@redhat.com> In-Reply-To: <1446618049-13596-1-git-send-email-eblake@redhat.com> References: <1446618049-13596-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v9 17/27] qapi: Clean up after previous commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth From: Markus Armbruster QAPISchemaObjectTypeVariants.check() parameter members is no longer used, drop it. Signed-off-by: Markus Armbruster Message-Id: <1446559499-26984-3-git-send-email-armbru@redhat.com> [Variant.check(seen) is used after all, so reword and reduce scope of this patch; rearrange later in the series] Signed-off-by: Eric Blake --- v9: new patch --- scripts/qapi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 4019389..3af5edb 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -991,7 +991,7 @@ class QAPISchemaObjectType(QAPISchemaType): assert m.name not in seen seen[m.name] = m if self.variants: - self.variants.check(schema, [], seen) + self.variants.check(schema, seen) self.members = seen.values() def is_implicit(self): @@ -1046,7 +1046,7 @@ class QAPISchemaObjectTypeVariants(object): self.tag_member = tag_member self.variants = variants - def check(self, schema, members, seen): + def check(self, schema, seen): # seen is non-empty for unions, empty for alternates if self.tag_name: # flat union self.tag_member = seen[self.tag_name] @@ -1086,7 +1086,7 @@ class QAPISchemaAlternateType(QAPISchemaType): def check(self, schema): self.variants.tag_member.check(schema) - self.variants.check(schema, [], {}) + self.variants.check(schema, {}) def json_type(self): return 'value' -- 2.4.3