On 02/11/2018 03:36 AM, Markus Armbruster wrote:
Move qapi-schema.json to qapi/, so it's next to its modules, and all
files get generated to qapi/, not just the ones generated for modules.
Consistently name the generated files qapi-MODULE.EXT:
qmp-commands.[ch] become qapi-commands.[ch], qapi-event.[ch] become
qapi-events.[ch], and qmp-introspect.[ch] become qapi-introspect.[ch].
This gets rid of the temporary hacks in scripts/qapi/commands.py and
scripts/qapi/events.py.
Ah, so my parallel series that proposed naming the file
qapi/qmp-schema.qapi gets interesting, with your patch favoring the
qapi- naming everywhere. I'll have to think about how much (or little)
of my series to rebase on top of this (I like my notion of renaming to
the .qapi suffix, though, as we really are using files that aren't JSON,
but only resemble it).
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
+++ b/.gitignore
@@ -29,8 +29,8 @@
/qga/qapi-generated
/qapi-generated
/qapi-gen-timestamp
-/qapi-builtin-types.[ch]
-/qapi-builtin-visit.[ch]
+/qapi/qapi-builtin-types.[ch]
+/qapi/qapi-builtin-visit.[ch]
Might be some interesting churn if you like my idea of using globs for
easier maintenance of this file.
+++ b/tpm.c
@@ -182,7 +182,6 @@ int tpm_config_parse(QemuOptsList *opts_list, const char
*optarg)
/*
* Walk the list of active TPM backends and collect information about them
- * following the schema description in qapi-schema.json.
*/
Should the overall comment keep the trailing '.'?
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
