On 03/21/2014 10:01 AM, Benoît Canet wrote: > The new directive in the form { 'include': 'path/to/file.json' } will trigger > the > parsing of path/to/file.json. > The directive will be replaced by the result of the parsing. > > This will allow for easy modularisation of qapi JSON descriptions files. > > The qapi commands now takes the input file path as first argument to make it > easier to detect include loops: stdin would not allow to do this.
It would be better to split this into two patches - one that alters the framework to pass filenames and updates the testsuite to reflect the improved error messages in existing tests, and the second to add the new 'include' directive with the new tests. > > Signed-off-by: Benoit Canet <ben...@irqsave.net> > --- > Makefile | 24 +++++------ > scripts/qapi-commands.py | 8 +++- > scripts/qapi-types.py | 8 +++- > scripts/qapi-visit.py | 8 +++- > scripts/qapi.py | 46 > +++++++++++++++++----- > tests/Makefile | 16 ++++---- Missing a change to docs/qapi-code-gen.txt. New features require documentation. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature