diff mbox series

[v3,34/50] qapi2texi: add 'If:' condition to struct members

Message ID	20170911110623.24981-35-marcandre.lureau@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3B723166378 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 11 Sep 2017 13:06:07 +0200 Message-Id: <20170911110623.24981-35-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 34/50] qapi2texi: add 'If:' condition to struct members Precedence: list Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>, armbru@redhat.com, Michael Roth <mdroth@linux.vnet.ibm.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	Hi, \| expand [v3,00/50] Hi, [v3,01/50] qlit: add qobject_from_qlit() [v3,02/50] qapi: generate a literal qobject for introspection [v3,03/50] qapi2texi: minor python code simplification [v3,04/50] qapi: add 'if' to top-level expressions [v3,05/50] qapi: add tests for invalid 'if' [v3,06/50] qapi: pass 'if' condition into QAPISchemaEntity objects [v3,07/50] qapi: add 'ifcond' to visitor methods [v3,08/50] qapi: mcgen() shouldn't indent # lines [v3,09/50] qapi: add #if/#endif helpers [v3,10/50] qapi-introspect: modify to_qlit() to append ', ' on level > 0 [v3,11/50] qapi-introspect: modify to_qlit() to generate #if code [v3,12/50] qapi-introspect: add preprocessor conditions to generated QLit [v3,13/50] qapi-commands: add #if conditions to commands [v3,14/50] qapi-event: add #if conditions to events [v3,15/50] qapi-types: refactor variants handling [v3,16/50] qapi-types: add #if conditions to types & visitors [v3,17/50] qapi: do not define enumeration value explicitely [v3,18/50] qapi: change enum visitor to take QAPISchemaMember [v3,19/50] qapi: add 'if' to enum members [v3,20/50] qapi-event: add 'if' condition to generated enum [v3,21/50] qapi: add #if conditions on generated enum members [v3,22/50] tests: add some enum members tests [v3,23/50] qapi: add 'if' to struct members and implicit objects members [v3,24/50] qapi: add some struct member tests [v3,25/50] qapi: add #if conditions to generated struct members [v3,26/50] qapi: add 'if' on union variants [v3,27/50] qapi: add #if conditions to generated variants [v3,28/50] qapi: add 'if' to alternate variant [v3,29/50] qapi: add tests for invalid alternate [v3,30/50] qapi: add #if conditions to generated alternate variants [v3,31/50] docs: document schema configuration [v3,32/50] qapi2texi: add 'If:' section to generated documentation [v3,33/50] qapi2texi: add 'If:' condition to enum values [v3,34/50] qapi2texi: add 'If:' condition to struct members [v3,35/50] qapi2texi: add condition to variants [v3,36/50] qapi: add conditions to VNC type/commands/events on the schema [v3,37/50] qapi: add conditions to SPICE type/commands/events on the schema [v3,38/50] qapi: add conditions to REPLICATION type/commands on the schema [v3,39/50] qapi-commands: don't initialize command list in qmp_init_marshall() [v3,40/50] qapi: add -i/--include filename.h [v3,41/50] qapi: add a 'unit' pragma [v3,42/50] qapi: add a -u/--unit option to specify which unit to visit [v3,43/50] build-sys: move qmp-introspect per target [v3,44/50] build-sys: add a target schema [v3,45/50] qapi: make rtc-reset-reinjection depend on TARGET_I386 [v3,46/50] qapi: make s390 commands depend on TARGET_S390X [v3,47/50] target.json: add a note about query-cpu* not being s390x-specific [v3,48/50] qapi: make query-gic-capabilities depend on TARGET_ARM [v3,49/50] qapi: make query-cpu-model-expansion depend on s390 or x86 [v3,50/50] qapi: make query-cpu-definitions depend on specific targets

Commit Message

Marc-André Lureau Sept. 11, 2017, 11:06 a.m. UTC

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 scripts/qapi2texi.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
index 7327245a60..bb819856ef 100755
--- a/scripts/qapi2texi.py
+++ b/scripts/qapi2texi.py
@@ -138,9 +138,10 @@  def texi_member(member, suffix=''):
     """Format a table of members item for an object type member"""
     typ = member.type.doc_type()
     membertype = ': ' + typ if typ else ''
-    return '@item @code{%s%s}%s%s\n' % (
+    return '@item @code{%s%s}%s%s%s\n' % (
         member.name, membertype,
         ' (optional)' if member.optional else '',
+        '\n@b{If:} @code{%s}\n' % member.ifcond if member.ifcond else '',
         suffix)