On 03/13/2017 01:18 AM, Markus Armbruster wrote: > I'm proposing this is 2.9 because it fixes a documentation regression. > It affects only documentation; generated C code is unchanged except > for the removal of trailing space in PATCH 46. >
> Additionally, my series fixes a number of bugs and cleans up along the > way. In particular, it converts qapi2texi.py from parse trees to the > visitor interface the other generators use. > > Future generated documentation work includes eliding types that aren't > visible in QMP (like introspection does), and making uses of type > names links in HTML. Reporting here, so it doesn't get lost in IRC. Other potential future work: fix this poor error message: GEN docs/qemu-qmp-qapi.texi Traceback (most recent call last): File "/home/eblake/qemu/scripts/qapi2texi.py", line 300, in <module> main(sys.argv) File "/home/eblake/qemu/scripts/qapi2texi.py", line 296, in main print texi_schema(schema) File "/home/eblake/qemu/scripts/qapi2texi.py", line 279, in texi_schema gen.symbol(doc, schema.lookup_entity(doc.symbol)) File "/home/eblake/qemu/scripts/qapi2texi.py", line 263, in symbol entity.visit(self) File "/home/eblake/qemu/scripts/qapi.py", line 1448, in visit visitor.visit_event(self.name, self.info, self.arg_type, self.boxed) File "/home/eblake/qemu/scripts/qapi2texi.py", line 259, in visit_event body=texi_entity(doc, 'Arguments')) File "/home/eblake/qemu/scripts/qapi2texi.py", line 200, in texi_entity + texi_sections(doc)) File "/home/eblake/qemu/scripts/qapi2texi.py", line 160, in texi_members items += member_func(section.member) + desc + '\n' File "/home/eblake/qemu/scripts/qapi2texi.py", line 138, in texi_member typ = member.type.doc_type() AttributeError: 'NoneType' object has no attribute 'type' Makefile:706: recipe for target 'docs/qemu-qmp-qapi.texi' failed make: *** [docs/qemu-qmp-qapi.texi] Error 1 make: *** Deleting file 'docs/qemu-qmp-qapi.texi' caused by this small change (documenting an event member, but omitting 'data' for the event itself): diff --git i/qapi/event.json w/qapi/event.json index 6d22b02..8978b33 100644 --- i/qapi/event.json +++ w/qapi/event.json @@ -68,6 +68,8 @@ # # Emitted when the virtual machine is stopped # +# @bogus: new field +# # Since: 0.12.0 # # Example: -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature