diff options
| author | Peter Maydell | 2019-03-05 20:23:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-05 20:23:45 +0100 |
| commit | a3e3b0a7bd5de211a62cdf2d6c12b96d3c403560 (patch) | |
| tree | b6c5f9492569c8840f61633c02e4aa326dda0aa4 /scripts/qapi/doc.py | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190305'... (diff) | |
| parent | qapi: Fix array first used in a different module (diff) | |
| download | qemu-a3e3b0a7bd5de211a62cdf2d6c12b96d3c403560.tar.gz qemu-a3e3b0a7bd5de211a62cdf2d6c12b96d3c403560.tar.xz qemu-a3e3b0a7bd5de211a62cdf2d6c12b96d3c403560.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2019-03-05' into staging
QAPI patches for 2019-03-05
# gpg: Signature made Tue 05 Mar 2019 16:47:17 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2019-03-05:
qapi: Fix array first used in a different module
tests/qapi-schema: Cover forward reference to sub-module
tests: Rename UserDefNativeListUnion to UserDefListUnion
qapi: Fix code generation for sub-modules in other directories
qapi: Pass file name to QAPIGen constructor instead of methods
tests/qapi-schema: Cover conditional arrays
tests/qapi-schema: Make test-qapi.py print arrays
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi/doc.py')
| -rwxr-xr-x | scripts/qapi/doc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi/doc.py b/scripts/qapi/doc.py index c03b690161..5c8c136899 100755 --- a/scripts/qapi/doc.py +++ b/scripts/qapi/doc.py @@ -207,11 +207,11 @@ def texi_entity(doc, what, ifcond, base=None, variants=None, class QAPISchemaGenDocVisitor(qapi.common.QAPISchemaVisitor): def __init__(self, prefix): self._prefix = prefix - self._gen = qapi.common.QAPIGenDoc() + self._gen = qapi.common.QAPIGenDoc(self._prefix + 'qapi-doc.texi') self.cur_doc = None def write(self, output_dir): - self._gen.write(output_dir, self._prefix + 'qapi-doc.texi') + self._gen.write(output_dir) def visit_enum_type(self, name, info, ifcond, members, prefix): doc = self.cur_doc |