From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drMYV-0005HT-5s for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drMYP-0006EE-49 for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drMYO-0006D3-Rt for qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:01 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Mon, 11 Sep 2017 13:05:45 +0200 Message-Id: <20170911110623.24981-13-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 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 12/50] qapi-introspect: add preprocessor conditions to generated QLit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth Add 'ifcond' condition to top-level QLit objects. to_qlit() handles the (obj, ifcond) tuples in previous patch. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi-introspect.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py index dc70954e8a..69d9afc792 100644 --- a/scripts/qapi-introspect.py +++ b/scripts/qapi-introspect.py @@ -128,12 +128,12 @@ const QLitObject %(c_name)s =3D %(c_string)s; return '[' + self._use_type(typ.element_type) + ']' return self._name(typ.name) =20 - def _gen_qlit(self, name, mtype, obj): + def _gen_qlit(self, name, mtype, obj, ifcond): if mtype not in ('command', 'event', 'builtin', 'array'): name =3D self._name(name) obj['name'] =3D name obj['meta-type'] =3D mtype - self._qlits.append(obj) + self._qlits.append((obj, ifcond)) =20 def _gen_member(self, member): ret =3D {'name': member.name, 'type': self._use_type(member.type= )} @@ -149,26 +149,27 @@ const QLitObject %(c_name)s =3D %(c_string)s; return {'case': variant.name, 'type': self._use_type(variant.typ= e)} =20 def visit_builtin_type(self, name, info, json_type): - self._gen_qlit(name, 'builtin', {'json-type': json_type}) + self._gen_qlit(name, 'builtin', {'json-type': json_type}, None) =20 def visit_enum_type(self, name, info, ifcond, values, prefix): - self._gen_qlit(name, 'enum', {'values': values}) + self._gen_qlit(name, 'enum', {'values': values}, ifcond) =20 def visit_array_type(self, name, info, ifcond, element_type): element =3D self._use_type(element_type) - self._gen_qlit('[' + element + ']', 'array', {'element-type': el= ement}) + self._gen_qlit('[' + element + ']', 'array', {'element-type': el= ement}, + ifcond) =20 def visit_object_type_flat(self, name, info, ifcond, members, varian= ts): obj =3D {'members': [self._gen_member(m) for m in members]} if variants: obj.update(self._gen_variants(variants.tag_member.name, variants.variants)) - self._gen_qlit(name, 'object', obj) + self._gen_qlit(name, 'object', obj, ifcond) =20 def visit_alternate_type(self, name, info, ifcond, variants): self._gen_qlit(name, 'alternate', {'members': [{'type': self._use_type(m.type)} - for m in variants.variants]}) + for m in variants.variants]}, ifcond= ) =20 def visit_command(self, name, info, ifcond, arg_type, ret_type, gen, success_response, boxed): @@ -176,11 +177,12 @@ const QLitObject %(c_name)s =3D %(c_string)s; ret_type =3D ret_type or self._schema.the_empty_object_type self._gen_qlit(name, 'command', {'arg-type': self._use_type(arg_type), - 'ret-type': self._use_type(ret_type)}) + 'ret-type': self._use_type(ret_type)}, ifcond) =20 def visit_event(self, name, info, ifcond, arg_type, boxed): arg_type =3D arg_type or self._schema.the_empty_object_type - self._gen_qlit(name, 'event', {'arg-type': self._use_type(arg_ty= pe)}) + self._gen_qlit(name, 'event', {'arg-type': self._use_type(arg_ty= pe)}, + ifcond) =20 # Debugging aid: unmask QAPI schema's type names # We normally mask them, because they're not QMP wire ABI --=20 2.14.1.146.gd35faa819