Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812331/?format=api
{ "id": 812331, "url": "http://patchwork.ozlabs.org/api/patches/812331/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-19-marcandre.lureau@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170911110623.24981-19-marcandre.lureau@redhat.com>", "list_archive_url": null, "date": "2017-09-11T11:05:51", "name": "[v3,18/50] qapi: change enum visitor to take QAPISchemaMember", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "8ff391ffc2eed1f8ebb5fc44d70c5c99812de424", "submitter": { "id": 66774, "url": "http://patchwork.ozlabs.org/api/people/66774/?format=api", "name": "Marc-André Lureau", "email": "marcandre.lureau@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-19-marcandre.lureau@redhat.com/mbox/", "series": [ { "id": 2480, "url": "http://patchwork.ozlabs.org/api/series/2480/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2480", "date": "2017-09-11T11:05:33", "name": "Hi,", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2480/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812331/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812331/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrQTl59RZz9s7G\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 11 Sep 2017 21:20:58 +1000 (AEST)", "from localhost ([::1]:56800 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1drMls-0000Ak-6A\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:20:56 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:43034)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1drMYh-0005Z5-On\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:22 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1drMYf-0006SJ-Cu\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:19 -0400", "from mx1.redhat.com ([209.132.183.28]:48094)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <marcandre.lureau@redhat.com>)\n\tid 1drMYf-0006RT-3B\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:17 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 3B321230762;\n\tMon, 11 Sep 2017 11:07:16 +0000 (UTC)", "from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9B21E60A98;\n\tMon, 11 Sep 2017 11:07:15 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 3B321230762", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 11 Sep 2017 13:05:51 +0200", "Message-Id": "<20170911110623.24981-19-marcandre.lureau@redhat.com>", "In-Reply-To": "<20170911110623.24981-1-marcandre.lureau@redhat.com>", "References": "<20170911110623.24981-1-marcandre.lureau@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 11 Sep 2017 11:07:16 +0000 (UTC)", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v3 18/50] qapi: change enum visitor to take\n\tQAPISchemaMember", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\tarmbru@redhat.com, Michael Roth <mdroth@linux.vnet.ibm.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "This will allow to add and access more properties associated with enum\nvalues/members, like the associated 'if' condition. We may want to\nhave a specialized type QAPISchemaEnumMember, for now this will do.\n\nSuggested-by: Markus Armbruster <armbru@redhat.com>\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n scripts/qapi.py | 40 +++++++++++++-------------\n scripts/qapi-event.py | 2 +-\n scripts/qapi-introspect.py | 5 ++--\n scripts/qapi-types.py | 10 +++----\n scripts/qapi-visit.py | 2 +-\n scripts/qapi2texi.py | 2 +-\n tests/qapi-schema/comments.out | 14 +++++++--\n tests/qapi-schema/doc-good.out | 17 +++++++++--\n tests/qapi-schema/empty.out | 9 +++++-\n tests/qapi-schema/event-case.out | 9 +++++-\n tests/qapi-schema/ident-with-escape.out | 9 +++++-\n tests/qapi-schema/include-relpath.out | 14 +++++++--\n tests/qapi-schema/include-repetition.out | 14 +++++++--\n tests/qapi-schema/include-simple.out | 14 +++++++--\n tests/qapi-schema/indented-expr.out | 9 +++++-\n tests/qapi-schema/qapi-schema-test.out | 49 ++++++++++++++++++++++++++------\n tests/qapi-schema/test-qapi.py | 17 +++++++----\n 17 files changed, 177 insertions(+), 59 deletions(-)", "diff": "diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 074ee221a1..386a577a59 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -1039,7 +1039,7 @@ class QAPISchemaVisitor(object):\n def visit_builtin_type(self, name, info, json_type):\n pass\n \n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n pass\n \n def visit_array_type(self, name, info, ifcond, element_type):\n@@ -1127,21 +1127,21 @@ class QAPISchemaBuiltinType(QAPISchemaType):\n \n \n class QAPISchemaEnumType(QAPISchemaType):\n- def __init__(self, name, info, doc, ifcond, values, prefix):\n+ def __init__(self, name, info, doc, ifcond, members, prefix):\n QAPISchemaType.__init__(self, name, info, doc, ifcond)\n- for v in values:\n- assert isinstance(v, QAPISchemaMember)\n- v.set_owner(name)\n+ for m in members:\n+ assert isinstance(m, QAPISchemaMember)\n+ m.set_owner(name)\n assert prefix is None or isinstance(prefix, str)\n- self.values = values\n+ self.members = members\n self.prefix = prefix\n \n def check(self, schema):\n seen = {}\n- for v in self.values:\n- v.check_clash(self.info, seen)\n+ for m in self.members:\n+ m.check_clash(self.info, seen)\n if self.doc:\n- self.doc.connect_member(v)\n+ self.doc.connect_member(m)\n \n def is_implicit(self):\n # See QAPISchema._make_implicit_enum_type() and ._def_predefineds()\n@@ -1151,14 +1151,14 @@ class QAPISchemaEnumType(QAPISchemaType):\n return c_name(self.name)\n \n def member_names(self):\n- return [v.name for v in self.values]\n+ return [m.name for m in self.members]\n \n def json_type(self):\n return 'string'\n \n def visit(self, visitor):\n visitor.visit_enum_type(self.name, self.info, self.ifcond,\n- self.member_names(), self.prefix)\n+ self.members, self.prefix)\n \n \n class QAPISchemaArrayType(QAPISchemaType):\n@@ -1952,19 +1952,19 @@ def ifcond_decorator(func):\n return func_wrapper\n \n \n-def gen_enum_lookup(name, values, prefix=None):\n+def gen_enum_lookup(name, members, prefix=None):\n ret = mcgen('''\n \n const QEnumLookup %(c_name)s_lookup = {\n .array = (const char *const[]) {\n ''',\n c_name=c_name(name))\n- for value in values:\n- index = c_enum_const(name, value, prefix)\n+ for m in members:\n+ index = c_enum_const(name, m.name, prefix)\n ret += mcgen('''\n- [%(index)s] = \"%(value)s\",\n+ [%(index)s] = \"%(name)s\",\n ''',\n- index=index, value=value)\n+ index=index, name=m.name)\n \n ret += mcgen('''\n },\n@@ -1975,9 +1975,9 @@ const QEnumLookup %(c_name)s_lookup = {\n return ret\n \n \n-def gen_enum(name, values, prefix=None):\n+def gen_enum(name, members, prefix=None):\n # append automatically generated _MAX value\n- enum_values = values + ['_MAX']\n+ enum_members = members + [QAPISchemaMember('_MAX')]\n \n ret = mcgen('''\n \n@@ -1985,11 +1985,11 @@ typedef enum %(c_name)s {\n ''',\n c_name=c_name(name))\n \n- for value in enum_values:\n+ for m in enum_members:\n ret += mcgen('''\n %(c_enum)s,\n ''',\n- c_enum=c_enum_const(name, value, prefix))\n+ c_enum=c_enum_const(name, m.name, prefix))\n \n ret += mcgen('''\n } %(c_name)s;\ndiff --git a/scripts/qapi-event.py b/scripts/qapi-event.py\nindex bef301dfe9..38f4264817 100644\n--- a/scripts/qapi-event.py\n+++ b/scripts/qapi-event.py\n@@ -168,7 +168,7 @@ class QAPISchemaGenEventVisitor(QAPISchemaVisitor):\n def visit_event(self, name, info, ifcond, arg_type, boxed):\n self.decl += gen_event_send_decl(name, arg_type, boxed)\n self.defn += gen_event_send(name, arg_type, boxed)\n- self._event_names.append(name)\n+ self._event_names.append(QAPISchemaMember(name))\n \n \n (input_file, output_dir, do_c, do_h, prefix, dummy) = parse_command_line()\ndiff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py\nindex 69d9afc792..32a58cf879 100644\n--- a/scripts/qapi-introspect.py\n+++ b/scripts/qapi-introspect.py\n@@ -151,8 +151,9 @@ const QLitObject %(c_name)s = %(c_string)s;\n def visit_builtin_type(self, name, info, json_type):\n self._gen_qlit(name, 'builtin', {'json-type': json_type}, None)\n \n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n- self._gen_qlit(name, 'enum', {'values': values}, ifcond)\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n+ self._gen_qlit(name, 'enum',\n+ {'values': [m.name for m in members]}, ifcond)\n \n def visit_array_type(self, name, info, ifcond, element_type):\n element = self._use_type(element_type)\ndiff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 789e89ff59..75c1823e44 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -203,16 +203,16 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self.defn += gen_type_cleanup(name)\n \n @ifcond_decorator\n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n # Special case for our lone builtin enum type\n # TODO use something cleaner than existence of info\n if not info:\n- self._btin += gen_enum(name, values, prefix)\n+ self._btin += gen_enum(name, members, prefix)\n if do_builtins:\n- self.defn += gen_enum_lookup(name, values, prefix)\n+ self.defn += gen_enum_lookup(name, members, prefix)\n else:\n- self._fwdecl += gen_enum(name, values, prefix)\n- self.defn += gen_enum_lookup(name, values, prefix)\n+ self._fwdecl += gen_enum(name, members, prefix)\n+ self.defn += gen_enum_lookup(name, members, prefix)\n \n @ifcond_decorator\n def visit_array_type(self, name, info, ifcond, element_type):\ndiff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py\nindex 4b0e005437..7e816ae98e 100644\n--- a/scripts/qapi-visit.py\n+++ b/scripts/qapi-visit.py\n@@ -284,7 +284,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self._btin = None\n \n @ifcond_decorator\n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n # Special case for our lone builtin enum type\n # TODO use something cleaner than existence of info\n if not info:\ndiff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py\nindex cf63cb0006..e72e7cfe0b 100755\n--- a/scripts/qapi2texi.py\n+++ b/scripts/qapi2texi.py\n@@ -207,7 +207,7 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):\n def visit_begin(self, schema):\n self.out = ''\n \n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n doc = self.cur_doc\n if self.out:\n self.out += '\\n'\ndiff --git a/tests/qapi-schema/comments.out b/tests/qapi-schema/comments.out\nindex 17e652535c..17b493ec24 100644\n--- a/tests/qapi-schema/comments.out\n+++ b/tests/qapi-schema/comments.out\n@@ -1,4 +1,14 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n-enum Status ['good', 'bad', 'ugly']\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n+enum Status\n+ member good:\n+ member bad:\n+ member ugly:\n object q_empty\ndiff --git a/tests/qapi-schema/doc-good.out b/tests/qapi-schema/doc-good.out\nindex 63ca25a8b9..0de06ce345 100644\n--- a/tests/qapi-schema/doc-good.out\n+++ b/tests/qapi-schema/doc-good.out\n@@ -1,19 +1,30 @@\n object Base\n member base1: Enum optional=False\n-enum Enum ['one', 'two']\n+enum Enum\n+ member one:\n+ member two:\n object Object\n base Base\n tag base1\n case one: Variant1\n case two: Variant2\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n object SugaredUnion\n member type: SugaredUnionKind optional=False\n tag type\n case one: q_obj_Variant1-wrapper\n case two: q_obj_Variant2-wrapper\n-enum SugaredUnionKind ['one', 'two']\n+enum SugaredUnionKind\n+ member one:\n+ member two:\n object Variant1\n member var1: str optional=False\n object Variant2\ndiff --git a/tests/qapi-schema/empty.out b/tests/qapi-schema/empty.out\nindex 40b886ddae..9859251087 100644\n--- a/tests/qapi-schema/empty.out\n+++ b/tests/qapi-schema/empty.out\n@@ -1,3 +1,10 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n object q_empty\ndiff --git a/tests/qapi-schema/event-case.out b/tests/qapi-schema/event-case.out\nindex 313c0fe7be..4dccc8f61e 100644\n--- a/tests/qapi-schema/event-case.out\n+++ b/tests/qapi-schema/event-case.out\n@@ -1,5 +1,12 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n event oops None\n boxed=False\n object q_empty\ndiff --git a/tests/qapi-schema/ident-with-escape.out b/tests/qapi-schema/ident-with-escape.out\nindex b5637cb2e0..4d17bc6783 100644\n--- a/tests/qapi-schema/ident-with-escape.out\n+++ b/tests/qapi-schema/ident-with-escape.out\n@@ -1,5 +1,12 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n command fooA q_obj_fooA-arg -> None\n gen=True success_response=True boxed=False\n object q_empty\ndiff --git a/tests/qapi-schema/include-relpath.out b/tests/qapi-schema/include-relpath.out\nindex 17e652535c..17b493ec24 100644\n--- a/tests/qapi-schema/include-relpath.out\n+++ b/tests/qapi-schema/include-relpath.out\n@@ -1,4 +1,14 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n-enum Status ['good', 'bad', 'ugly']\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n+enum Status\n+ member good:\n+ member bad:\n+ member ugly:\n object q_empty\ndiff --git a/tests/qapi-schema/include-repetition.out b/tests/qapi-schema/include-repetition.out\nindex 17e652535c..17b493ec24 100644\n--- a/tests/qapi-schema/include-repetition.out\n+++ b/tests/qapi-schema/include-repetition.out\n@@ -1,4 +1,14 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n-enum Status ['good', 'bad', 'ugly']\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n+enum Status\n+ member good:\n+ member bad:\n+ member ugly:\n object q_empty\ndiff --git a/tests/qapi-schema/include-simple.out b/tests/qapi-schema/include-simple.out\nindex 17e652535c..17b493ec24 100644\n--- a/tests/qapi-schema/include-simple.out\n+++ b/tests/qapi-schema/include-simple.out\n@@ -1,4 +1,14 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n-enum Status ['good', 'bad', 'ugly']\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n+enum Status\n+ member good:\n+ member bad:\n+ member ugly:\n object q_empty\ndiff --git a/tests/qapi-schema/indented-expr.out b/tests/qapi-schema/indented-expr.out\nindex 586795f44d..8bdc016e55 100644\n--- a/tests/qapi-schema/indented-expr.out\n+++ b/tests/qapi-schema/indented-expr.out\n@@ -1,5 +1,12 @@\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n command eins None -> None\n gen=True success_response=True boxed=False\n object q_empty\ndiff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out\nindex fc5fd25f1b..9a7cafc269 100644\n--- a/tests/qapi-schema/qapi-schema-test.out\n+++ b/tests/qapi-schema/qapi-schema-test.out\n@@ -33,7 +33,10 @@ event EVENT_F UserDefAlternate\n object Empty1\n object Empty2\n base Empty1\n-enum EnumOne ['value1', 'value2', 'value3']\n+enum EnumOne\n+ member value1:\n+ member value2:\n+ member value3:\n object EventStructOne\n member struct1: UserDefOne optional=False\n member string: str optional=False\n@@ -42,16 +45,25 @@ object ForceArrays\n member unused1: UserDefOneList optional=False\n member unused2: UserDefTwoList optional=False\n member unused3: TestStructList optional=False\n-enum MyEnum []\n+enum MyEnum\n object NestedEnumsOne\n member enum1: EnumOne optional=False\n member enum2: EnumOne optional=True\n member enum3: EnumOne optional=False\n member enum4: EnumOne optional=True\n-enum QEnumTwo ['value1', 'value2']\n+enum QEnumTwo\n prefix QENUM_TWO\n-enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n+ member value1:\n+ member value2:\n+enum QType\n prefix QTYPE\n+ member none:\n+ member qnull:\n+ member qnum:\n+ member qstring:\n+ member qdict:\n+ member qlist:\n+ member qbool:\n alternate TestIfAlternate\n tag type\n case foo: int\n@@ -60,7 +72,9 @@ alternate TestIfAlternate\n command TestIfCmd q_obj_TestIfCmd-arg -> None\n gen=True success_response=True boxed=False\n if defined(TEST_IF_CMD) && defined(TEST_IF_STRUCT)\n-enum TestIfEnum ['foo', 'bar']\n+enum TestIfEnum\n+ member foo:\n+ member bar:\n if defined(TEST_IF_ENUM)\n event TestIfEvent q_obj_TestIfEvent-arg\n boxed=False\n@@ -73,7 +87,8 @@ object TestIfUnion\n tag type\n case foo: q_obj_TestStruct-wrapper\n if defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)\n-enum TestIfUnionKind ['foo']\n+enum TestIfUnionKind\n+ member foo:\n if defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)\n object TestStruct\n member integer: int optional=False\n@@ -122,7 +137,21 @@ object UserDefNativeListUnion\n case string: q_obj_strList-wrapper\n case sizes: q_obj_sizeList-wrapper\n case any: q_obj_anyList-wrapper\n-enum UserDefNativeListUnionKind ['integer', 's8', 's16', 's32', 's64', 'u8', 'u16', 'u32', 'u64', 'number', 'boolean', 'string', 'sizes', 'any']\n+enum UserDefNativeListUnionKind\n+ member integer:\n+ member s8:\n+ member s16:\n+ member s32:\n+ member s64:\n+ member u8:\n+ member u16:\n+ member u32:\n+ member u64:\n+ member number:\n+ member boolean:\n+ member string:\n+ member sizes:\n+ member any:\n object UserDefOne\n base UserDefZero\n member string: str optional=False\n@@ -159,7 +188,8 @@ alternate __org.qemu_x-Alt\n case b: __org.qemu_x-Base\n object __org.qemu_x-Base\n member __org.qemu_x-member1: __org.qemu_x-Enum optional=False\n-enum __org.qemu_x-Enum ['__org.qemu_x-value']\n+enum __org.qemu_x-Enum\n+ member __org.qemu_x-value:\n object __org.qemu_x-Struct\n base __org.qemu_x-Base\n member __org.qemu_x-member2: str optional=False\n@@ -170,7 +200,8 @@ object __org.qemu_x-Union1\n member type: __org.qemu_x-Union1Kind optional=False\n tag type\n case __org.qemu_x-branch: q_obj_str-wrapper\n-enum __org.qemu_x-Union1Kind ['__org.qemu_x-branch']\n+enum __org.qemu_x-Union1Kind\n+ member __org.qemu_x-branch:\n object __org.qemu_x-Union2\n base __org.qemu_x-Base\n tag __org.qemu_x-member1\ndiff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py\nindex 8627f978af..67c6c1ecef 100644\n--- a/tests/qapi-schema/test-qapi.py\n+++ b/tests/qapi-schema/test-qapi.py\n@@ -17,19 +17,18 @@ import sys\n \n \n class QAPISchemaTestVisitor(QAPISchemaVisitor):\n- def visit_enum_type(self, name, info, ifcond, values, prefix):\n- print 'enum %s %s' % (name, values)\n+ def visit_enum_type(self, name, info, ifcond, members, prefix):\n+ print 'enum %s' % name\n if prefix:\n print ' prefix %s' % prefix\n+ self._print_members(members)\n self._print_if(ifcond)\n \n def visit_object_type(self, name, info, ifcond, base, members, variants):\n print 'object %s' % name\n if base:\n print ' base %s' % base.name\n- for m in members:\n- print ' member %s: %s optional=%s' % \\\n- (m.name, m.type.name, m.optional)\n+ self._print_members(members)\n self._print_variants(variants)\n self._print_if(ifcond)\n \n@@ -51,6 +50,14 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):\n print ' boxed=%s' % boxed\n self._print_if(ifcond)\n \n+ @staticmethod\n+ def _print_members(members):\n+ for m in members:\n+ print ' member %s:' % m.name,\n+ if isinstance(m, QAPISchemaObjectTypeMember):\n+ print '%s optional=%s' % (m.type.name, m.optional),\n+ print\n+\n @staticmethod\n def _print_variants(variants):\n if variants:\n", "prefixes": [ "v3", "18/50" ] }