From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, Michael Roth <mdroth@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH v12 08/36] qapi: Eliminate QAPISchemaObjectType.check() variable members
Date: Wed, 18 Nov 2015 01:52:43 -0700 [thread overview]
Message-ID: <1447836791-369-9-git-send-email-eblake@redhat.com> (raw)
In-Reply-To: <1447836791-369-1-git-send-email-eblake@redhat.com>
From: Markus Armbruster <armbru@redhat.com>
We can use seen.values() instead if we make it an OrderedDict.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1446559499-26984-5-git-send-email-armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
v12: no change
v11: no change
v10: redo closer to Markus' original proposal
v9: new patch
---
scripts/qapi.py | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 86d2adc..44d08c1 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -977,26 +977,22 @@ class QAPISchemaObjectType(QAPISchemaType):
if self.members:
return
self.members = False # mark as being checked
+ seen = OrderedDict()
if self._base_name:
self.base = schema.lookup_type(self._base_name)
assert isinstance(self.base, QAPISchemaObjectType)
assert not self.base.variants # not implemented
self.base.check(schema)
- members = list(self.base.members)
- else:
- members = []
- seen = {}
- for m in members:
- assert m.name not in seen
- seen[m.name] = m
+ for m in self.base.members:
+ assert m.name not in seen
+ seen[m.name] = m
for m in self.local_members:
m.check(schema)
assert m.name not in seen
seen[m.name] = m
- members.append(m)
if self.variants:
self.variants.check(schema, seen)
- self.members = members
+ self.members = seen.values()
def is_implicit(self):
# See QAPISchema._make_implicit_object_type()
--
2.4.3
next prev parent reply other threads:[~2015-11-18 8:53 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-18 8:52 [Qemu-devel] [PATCH v12 00/36] qapi member collision, alternate layout (post-introspection cleanups, subset D) Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 01/36] qapi: Track simple union tag in object.local_members Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 02/36] qapi-types: Consolidate gen_struct() and gen_union() Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 03/36] qapi-types: Simplify gen_struct_field[s] Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 04/36] qapi: Drop obsolete tag value collision assertions Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 05/36] qapi: Simplify QAPISchemaObjectTypeMember.check() Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 06/36] qapi: Clean up after previous commit Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 07/36] qapi: Fix up commit 7618b91's clash sanity checking change Eric Blake
2015-11-18 8:52 ` Eric Blake [this message]
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 09/36] qapi: Factor out QAPISchemaObjectTypeMember.check_clash() Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 10/36] qapi: Simplify QAPISchemaObjectTypeVariants.check() Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 11/36] qapi: Check for qapi collisions involving variant members Eric Blake
2015-11-18 10:01 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 12/36] qapi: Factor out QAPISchemaObjectType.check_clash() Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 13/36] qapi: Hoist tag collision check to Variants.check() Eric Blake
2015-11-18 10:08 ` Markus Armbruster
2015-11-18 10:24 ` Daniel P. Berrange
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 14/36] qapi: Remove outdated tests related to QMP/branch collisions Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 15/36] qapi: Track owner of each object member Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 16/36] qapi: Detect collisions in C member names Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 17/36] qapi: Fix c_name() munging Eric Blake
2015-11-18 10:18 ` Markus Armbruster
2015-11-18 16:20 ` Eric Blake
2015-11-18 17:59 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 18/36] qapi: Remove dead visitor code Eric Blake
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 19/36] blkdebug: Merge hand-rolled and qapi BlkdebugEvent enum Eric Blake
2015-11-18 10:30 ` Markus Armbruster
2015-11-18 12:08 ` Kevin Wolf
2015-11-18 16:26 ` Eric Blake
2015-11-18 16:34 ` Kevin Wolf
2015-11-18 18:04 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 20/36] blkdebug: Avoid '.' in enum values Eric Blake
2015-11-19 7:32 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 21/36] qapi: Tighten the regex on valid names Eric Blake
2015-11-18 11:51 ` Markus Armbruster
2015-11-18 16:57 ` Eric Blake
2015-11-18 18:08 ` Markus Armbruster
2015-11-18 21:45 ` [Qemu-devel] [PATCH] fixup! " Eric Blake
2015-11-19 8:10 ` Markus Armbruster
2015-11-19 23:25 ` Eric Blake
2015-11-20 6:16 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 22/36] qapi: Don't let implicit enum MAX member collide Eric Blake
2015-11-18 10:54 ` Juan Quintela
2015-11-18 13:12 ` Markus Armbruster
2015-11-18 17:00 ` Eric Blake
2015-11-18 18:09 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 23/36] qapi: Remove dead tests for max collision Eric Blake
2015-11-19 7:42 ` Markus Armbruster
2015-11-18 8:52 ` [Qemu-devel] [PATCH v12 24/36] cpu: Convert CpuInfo into flat union Eric Blake
2015-11-19 16:12 ` Markus Armbruster
2015-11-19 16:46 ` Eric Blake
2015-11-19 17:03 ` Markus Armbruster
2016-02-02 12:25 ` James Hogan
2016-02-02 13:49 ` Markus Armbruster
2016-02-02 14:49 ` Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 25/36] qapi: Add alias for ErrorClass Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 26/36] qapi: Change munging of CamelCase enum values Eric Blake
2015-11-18 13:46 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 27/36] qapi: Forbid case-insensitive clashes Eric Blake
2015-11-18 17:08 ` Markus Armbruster
2015-11-18 22:09 ` Eric Blake
2015-11-18 22:22 ` Eric Blake
2015-11-18 22:52 ` Eric Blake
2015-11-18 22:55 ` [Qemu-devel] [PATCH] fixup! " Eric Blake
2015-11-19 13:32 ` Markus Armbruster
2015-11-19 15:20 ` Eric Blake
2015-11-19 16:50 ` [Qemu-devel] [PATCH v12 27/36] " Markus Armbruster
2015-11-19 17:16 ` Eric Blake
2015-11-19 18:25 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 28/36] qapi: Simplify QObject Eric Blake
2015-11-18 18:23 ` Markus Armbruster
2015-11-18 23:47 ` [Qemu-devel] [PATCH] fixup? " Eric Blake
2015-11-19 8:58 ` Markus Armbruster
2015-11-19 9:12 ` Markus Armbruster
2015-11-19 14:19 ` Eric Blake
2015-11-19 14:43 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 29/36] qobject: Rename qtype_code to QType Eric Blake
2015-11-18 18:25 ` Markus Armbruster
2015-11-18 23:27 ` Eric Blake
2015-11-19 7:44 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 30/36] qapi: Convert QType into qapi builtin enum type Eric Blake
2015-11-18 18:40 ` Markus Armbruster
2015-11-18 19:14 ` Markus Armbruster
2015-11-19 0:19 ` [Qemu-devel] [PATCH] fixup! " Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 31/36] qapi: Simplify visiting of alternate types Eric Blake
2015-11-18 18:46 ` Markus Armbruster
2015-11-18 20:08 ` Eric Blake
2015-11-19 8:01 ` Markus Armbruster
2015-11-19 14:08 ` Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 32/36] qapi: Inline _make_implicit_tag() Eric Blake
2015-11-18 18:48 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 33/36] qapi: Fix alternates that accept 'number' but not 'int' Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 34/36] qapi: Add positive tests to qapi-schema-test Eric Blake
2015-11-20 22:49 ` Eric Blake
2015-11-23 7:34 ` Markus Armbruster
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 35/36] qapi: Simplify visits of optional fields Eric Blake
2015-11-18 18:54 ` Markus Armbruster
2015-11-18 20:10 ` Eric Blake
2015-11-18 8:53 ` [Qemu-devel] [PATCH v12 36/36] qapi: Shorter " Eric Blake
2015-11-18 19:04 ` Markus Armbruster
2015-11-18 19:19 ` [Qemu-devel] [PATCH v12 00/36] qapi member collision, alternate layout (post-introspection cleanups, subset D) Markus Armbruster
2015-11-19 0:25 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447836791-369-9-git-send-email-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).