[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] fixup! qapi: Track enum values by QAPISchemaMember,
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH] fixup! qapi: Track enum values by QAPISchemaMember, not string |
Date: |
Wed, 2 Dec 2015 09:09:05 -0700 |
Rather than making 2/3 callers explode a list just to have it
be reconstructed, instead fix the remaining caller to wrap its
arguments in a list.
Signed-off-by: Eric Blake <address@hidden>
---
Markus was right
scripts/qapi.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index bebd8c7..c107c4b 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1241,20 +1241,20 @@ class QAPISchema(object):
self.the_empty_object_type = QAPISchemaObjectType(':empty', None, None,
[], None)
self._def_entity(self.the_empty_object_type)
- qtype_values = self._make_enum_members('none', 'qnull', 'qint',
- 'qstring', 'qdict', 'qlist',
- 'qfloat', 'qbool')
+ qtype_values = self._make_enum_members(['none', 'qnull', 'qint',
+ 'qstring', 'qdict', 'qlist',
+ 'qfloat', 'qbool'])
self._def_entity(QAPISchemaEnumType('QType', None, qtype_values,
'QTYPE'))
- def _make_enum_members(self, *values):
+ def _make_enum_members(self, values):
return [QAPISchemaMember(v) for v in values]
def _make_implicit_enum_type(self, name, info, values):
# See also QAPISchemaObjectTypeMember._pretty_owner()
name = name + 'Kind' # Use namespace reserved by add_name()
self._def_entity(QAPISchemaEnumType(
- name, info, self._make_enum_members(*values), None))
+ name, info, self._make_enum_members(values), None))
return name
def _make_array_type(self, element_type, info):
@@ -1278,7 +1278,7 @@ class QAPISchema(object):
data = expr['data']
prefix = expr.get('prefix')
self._def_entity(QAPISchemaEnumType(
- name, info, self._make_enum_members(*data), prefix))
+ name, info, self._make_enum_members(data), prefix))
def _make_member(self, name, typ, info):
optional = False
--
2.4.3
- [Qemu-devel] [PATCH v14 06/15] qapi: Inline _make_implicit_tag(), (continued)
- [Qemu-devel] [PATCH v14 06/15] qapi: Inline _make_implicit_tag(), Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 01/15] qobject: Simplify QObject, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 07/15] qapi: Fix alternates that accept 'number' but not 'int', Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 09/15] qapi: Shorter visits of optional fields, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 02/15] qobject: Rename qtype_code to QType, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 10/15] qapi: Prepare new QAPISchemaMember base class, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 03/15] qapi: Convert QType into QAPI built-in enum type, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 08/15] qapi: Simplify visits of optional fields, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 11/15] qapi: Track enum values by QAPISchemaMember, not string, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 15/15] qapi: Detect base class loops, Eric Blake, 2015/12/02
- [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Eric Blake, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Markus Armbruster, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Eric Blake, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Eric Blake, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Markus Armbruster, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Eric Blake, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Markus Armbruster, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Markus Armbruster, 2015/12/02
- Re: [Qemu-devel] [PATCH v14 13/15] qapi: Enforce (or whitelist) case conventions on qapi members, Eric Blake, 2015/12/02