From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a49xz-0006dq-0e for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:09:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a49xw-0002vj-6b for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:09:14 -0500 Received: from resqmta-po-05v.sys.comcast.net ([2001:558:fe16:19:96:114:154:164]:46863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a49xw-0002vb-1G for qemu-devel@nongnu.org; Wed, 02 Dec 2015 11:09:12 -0500 From: Eric Blake Date: Wed, 2 Dec 2015 09:09:05 -0700 Message-Id: <1449072545-3260-1-git-send-email-eblake@redhat.com> In-Reply-To: <87oae8n8zu.fsf@blackfin.pond.sub.org> References: <87oae8n8zu.fsf@blackfin.pond.sub.org> Subject: [Qemu-devel] [PATCH] fixup! qapi: Track enum values by QAPISchemaMember, not string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth 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 --- 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