OSDN Git Service

qapi: Add a primitive to include other files from a QAPI schema file
authorLluís Vilanova <vilanova@ac.upc.edu>
Wed, 7 May 2014 18:46:15 +0000 (20:46 +0200)
committerLuiz Capitulino <lcapitulino@redhat.com>
Thu, 8 May 2014 18:19:58 +0000 (14:19 -0400)
commita719a27c824ea5e70f5bf6f3c8d13a8c1d6b1bfe
tree6510043e8cbf7065c8ea9802f67b91f425820143
parent33aaad529e7391a9ddc73682415e900950553200
qapi: Add a primitive to include other files from a QAPI schema file

The primitive uses JSON syntax, and include paths are relative to the file using the directive:

  { 'include': 'path/to/file.json' }

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
44 files changed:
docs/qapi-code-gen.txt
scripts/qapi.py
tests/Makefile
tests/qapi-schema/include-before-err.err [new file with mode: 0644]
tests/qapi-schema/include-before-err.exit [new file with mode: 0644]
tests/qapi-schema/include-before-err.json [new file with mode: 0644]
tests/qapi-schema/include-before-err.out [new file with mode: 0644]
tests/qapi-schema/include-cycle-b.json [new file with mode: 0644]
tests/qapi-schema/include-cycle-c.json [new file with mode: 0644]
tests/qapi-schema/include-cycle.err [new file with mode: 0644]
tests/qapi-schema/include-cycle.exit [new file with mode: 0644]
tests/qapi-schema/include-cycle.json [new file with mode: 0644]
tests/qapi-schema/include-cycle.out [new file with mode: 0644]
tests/qapi-schema/include-format-err.err [new file with mode: 0644]
tests/qapi-schema/include-format-err.exit [new file with mode: 0644]
tests/qapi-schema/include-format-err.json [new file with mode: 0644]
tests/qapi-schema/include-format-err.out [new file with mode: 0644]
tests/qapi-schema/include-nested-err.err [new file with mode: 0644]
tests/qapi-schema/include-nested-err.exit [new file with mode: 0644]
tests/qapi-schema/include-nested-err.json [new file with mode: 0644]
tests/qapi-schema/include-nested-err.out [new file with mode: 0644]
tests/qapi-schema/include-no-file.err [new file with mode: 0644]
tests/qapi-schema/include-no-file.exit [new file with mode: 0644]
tests/qapi-schema/include-no-file.json [new file with mode: 0644]
tests/qapi-schema/include-no-file.out [new file with mode: 0644]
tests/qapi-schema/include-non-file.err [new file with mode: 0644]
tests/qapi-schema/include-non-file.exit [new file with mode: 0644]
tests/qapi-schema/include-non-file.json [new file with mode: 0644]
tests/qapi-schema/include-non-file.out [new file with mode: 0644]
tests/qapi-schema/include-relpath-sub.json [new file with mode: 0644]
tests/qapi-schema/include-relpath.err [new file with mode: 0644]
tests/qapi-schema/include-relpath.exit [new file with mode: 0644]
tests/qapi-schema/include-relpath.json [new file with mode: 0644]
tests/qapi-schema/include-relpath.out [new file with mode: 0644]
tests/qapi-schema/include-self-cycle.err [new file with mode: 0644]
tests/qapi-schema/include-self-cycle.exit [new file with mode: 0644]
tests/qapi-schema/include-self-cycle.json [new file with mode: 0644]
tests/qapi-schema/include-self-cycle.out [new file with mode: 0644]
tests/qapi-schema/include-simple-sub.json [new file with mode: 0644]
tests/qapi-schema/include-simple.err [new file with mode: 0644]
tests/qapi-schema/include-simple.exit [new file with mode: 0644]
tests/qapi-schema/include-simple.json [new file with mode: 0644]
tests/qapi-schema/include-simple.out [new file with mode: 0644]
tests/qapi-schema/include/relpath.json [new file with mode: 0644]