mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 03:13:44 +08:00
qapi2texi: Use category "Object" for all object types
At the protocol level, the distinction between struct, flat union and simple union is meaningless, they are all JSON objects. Document them that way. Example change (qemu-qmp-ref.txt): - -- Simple Union: InputEvent + -- Object: InputEvent Input event union. This also fixes the completely broken headings for flat and simple unions in qemu-qmp-ref.7 and qemu-ga-ref.7, by sidestepping a bug in texi2pod.pl. For instance, it mistranslates "@deftp {Simple Union} InputEvent" to "B<Union> (Simple)", but translates "@deftp Object InputEvent" to "B<SocketAddress> (Object)". Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1489582656-31133-30-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
c19eaa64df
commit
75b50196d9
@ -219,17 +219,11 @@ class QAPISchemaGenDocVisitor(qapi.QAPISchemaVisitor):
|
||||
|
||||
def visit_object_type(self, name, info, base, members, variants):
|
||||
doc = self.cur_doc
|
||||
if not variants:
|
||||
typ = 'Struct'
|
||||
elif variants._tag_name: # TODO unclean member access
|
||||
typ = 'Flat Union'
|
||||
else:
|
||||
typ = 'Simple Union'
|
||||
if base and base.is_implicit():
|
||||
base = None
|
||||
if self.out:
|
||||
self.out += '\n'
|
||||
self.out += TYPE_FMT(type=typ,
|
||||
self.out += TYPE_FMT(type='Object',
|
||||
name=doc.symbol,
|
||||
body=texi_entity(doc, 'Members', base, variants))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user