{"id":812334,"url":"http://patchwork.ozlabs.org/api/patches/812334/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-29-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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-29-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:01","name":"[v3,28/50] qapi: add 'if' to alternate variant","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"30bcfa0926901cf3ded072d594bbd4bea7806cb0","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-29-marcandre.lureau@redhat.com/mbox/","series":[{"id":2480,"url":"http://patchwork.ozlabs.org/api/series/2480/?format=json","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/812334/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812334/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xrQWC4XGxz9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:22:15 +1000 (AEST)","from localhost ([::1]:56805 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMn7-0001Fm-NE\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:22:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43369)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMZ9-00060S-RS\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMZ3-0006oJ-Po\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:47 -0400","from mx1.redhat.com ([209.132.183.28]:38928)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drMZ3-0006nW-Is\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:41 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 C2C49C073D6B;\n\tMon, 11 Sep 2017 11:07:40 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6D3015DD60;\n\tMon, 11 Sep 2017 11:07:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C2C49C073D6B","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:06:01 +0200","Message-Id":"<20170911110623.24981-29-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tMon, 11 Sep 2017 11:07:40 +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 28/50] qapi: add 'if' to alternate variant","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tarmbru@redhat.com, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Marc-André Lureau \n---\n scripts/qapi.py | 9 ++++++++-\n tests/qapi-schema/qapi-schema-test.json | 6 +++++-\n tests/qapi-schema/qapi-schema-test.out | 8 +++++++-\n 3 files changed, 20 insertions(+), 3 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 2f14edfa1f..19e48bd4d2 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -849,6 +849,9 @@ def check_alternate(expr, info):\n check_type(info, \"Member '%s' of alternate '%s'\" % (key, name),\n value,\n allow_metas=['built-in', 'union', 'struct', 'enum'])\n+ if isinstance(value, dict):\n+ check_unknown_keys(info, value, {'type', 'if'})\n+ value = value['type']\n qtype = find_alternate_member_qtype(value)\n if not qtype:\n raise QAPISemError(info, \"Alternate '%s' member '%s' cannot use \"\n@@ -1671,7 +1674,11 @@ class QAPISchema(object):\n None))\n \n def _make_variant(self, case, typ):\n- return QAPISchemaObjectTypeVariant(case, typ)\n+ ifcond = None\n+ if isinstance(typ, dict):\n+ ifcond = typ.get('if')\n+ typ = typ['type']\n+ return QAPISchemaObjectTypeVariant(case, typ, ifcond)\n \n def _make_simple_variant(self, case, typ, info):\n ifcond = None\ndiff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json\nindex 895e80a978..f7a62b24d1 100644\n--- a/tests/qapi-schema/qapi-schema-test.json\n+++ b/tests/qapi-schema/qapi-schema-test.json\n@@ -208,9 +208,13 @@\n { 'command': 'TestIfUnionCmd', 'data': { 'union_cmd_arg': 'TestIfUnion' },\n 'if': 'defined(TEST_IF_UNION)' }\n \n-{ 'alternate': 'TestIfAlternate', 'data': { 'foo': 'int', 'bar': 'TestStruct' },\n+{ 'alternate': 'TestIfAlternate', 'data':\n+ { 'foo': 'int', 'alt_bar': { 'type': 'TestStruct', 'if': 'defined(TEST_IF_ALT_BAR)'} },\n 'if': 'defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)' }\n \n+{ 'command': 'TestIfAlternateCmd', 'data': { 'alt_cmd_arg': 'TestIfAlternate' },\n+ 'if': 'defined(TEST_IF_ALT)' }\n+\n { 'command': 'TestIfCmd', 'data':\n { 'foo': 'TestIfStruct',\n 'bar': { 'type': 'TestIfEnum', 'if': 'defined(TEST_IF_CMD_BAR)' } },\ndiff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out\nindex ee009c5626..6887e49c9b 100644\n--- a/tests/qapi-schema/qapi-schema-test.out\n+++ b/tests/qapi-schema/qapi-schema-test.out\n@@ -67,8 +67,11 @@ enum QType\n alternate TestIfAlternate\n tag type\n case foo: int\n- case bar: TestStruct\n+ case alt_bar: TestStruct if=defined(TEST_IF_ALT_BAR)\n if defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)\n+command TestIfAlternateCmd q_obj_TestIfAlternateCmd-arg -> None\n+ gen=True success_response=True boxed=False\n+ if defined(TEST_IF_ALT)\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@@ -232,6 +235,9 @@ object q_obj_EVENT_D-arg\n member b: str optional=False\n member c: str optional=True\n member enum3: EnumOne optional=True\n+object q_obj_TestIfAlternateCmd-arg\n+ member alt_cmd_arg: TestIfAlternate optional=False\n+ if defined(TEST_IF_ALT)\n object q_obj_TestIfCmd-arg\n member foo: TestIfStruct optional=False\n member bar: TestIfEnum optional=False if=defined(TEST_IF_CMD_BAR)\n","prefixes":["v3","28/50"]}