On 02/11/2018 03:49 AM, Markus Armbruster wrote:
Eric Blake <ebl...@redhat.com> writes:

Having two files in the tree both named qapi-schema.json just adds
confusion.  Rename these files, and relocate them into the common
qapi/ subdirectory.  Update all build rules that refer to the file
names, and adjust other documentation and comment references to
either track the new name or be rewritten so as to not mention
the file name.

Maintainer-wise, this means that qapi/qga-schema.json continues
to belong to Michael as QGA maintainer, but now also notifies
Markus and Eric as QAPI maintainers, alongside all the other
QMP QAPI files, matching how other .json QAPI modules belong
to multiple maintainer blurbs.

Signed-off-by: Eric Blake <ebl...@redhat.com>
  docs/devel/writing-qmp-commands.txt          | 13 ++++++-----
  docs/interop/qmp-intro.txt                   |  3 ++-
  Makefile                                     | 10 ++++----
  qga/qapi-schema.json => qapi/qga-schema.json |  0

This move is up to the QGA maintainer.  My usual argument for keeping
the schema in one place is weak for the QGA schema: it's maintained
separately, and ususuall grepped separately, too.

Michael, your thoughts?

  qapi-schema.json => qapi/qmp-schema.json     | 34 ++++++++++++++--------------

While it was certainly created for QMP, it's now used for non-QMP stuff,
too.  Do we mind?

Well, patch 3 renames it further; having qapi/qapi-schema.qapi sounds redundant, and the fact that the file DOES drive our QMP decisions (even if it has some other types for internal use only) seems reasonable enough. If anyone has a better name, I'm all ears.

  tpm.c                                        |  2 +-
  MAINTAINERS                                  |  2 +-
  7 files changed, 33 insertions(+), 31 deletions(-)
  rename qga/qapi-schema.json => qapi/qga-schema.json (100%)
  rename qapi-schema.json => qapi/qmp-schema.json (99%)

Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Reply via email to