Hi On Thu, Aug 24, 2017 at 9:20 PM Markus Armbruster <arm...@redhat.com> wrote:
> query-version and query-commands are in common.json for no good > reason. Several similar queries are in qapi-schema.json. Move them > there. > > I suppose it was initially meant to be shared with all QMP users, qga etc? That didn't happen, and is not planned either Signed-off-by: Markus Armbruster <arm...@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > qapi-schema.json | 103 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qapi/common.json | 103 > ------------------------------------------------------- > 2 files changed, 103 insertions(+), 103 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 80c15da..7a393ec 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -119,6 +119,109 @@ > { 'command': 'qmp_capabilities' } > > ## > +# @VersionTriple: > +# > +# A three-part version number. > +# > +# @major: The major version number. > +# > +# @minor: The minor version number. > +# > +# @micro: The micro version number. > +# > +# Since: 2.4 > +## > +{ 'struct': 'VersionTriple', > + 'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} } > + > + > +## > +# @VersionInfo: > +# > +# A description of QEMU's version. > +# > +# @qemu: The version of QEMU. By current convention, a micro > +# version of 50 signifies a development branch. A micro > version > +# greater than or equal to 90 signifies a release candidate > for > +# the next minor version. A micro version of less than 50 > +# signifies a stable release. > +# > +# @package: QEMU will always set this field to an empty string. > Downstream > +# versions of QEMU should set this to a non-empty string. > The > +# exact format depends on the downstream however it highly > +# recommended that a unique name is used. > +# > +# Since: 0.14.0 > +## > +{ 'struct': 'VersionInfo', > + 'data': {'qemu': 'VersionTriple', 'package': 'str'} } > + > +## > +# @query-version: > +# > +# Returns the current version of QEMU. > +# > +# Returns: A @VersionInfo object describing the current version of QEMU. > +# > +# Since: 0.14.0 > +# > +# Example: > +# > +# -> { "execute": "query-version" } > +# <- { > +# "return":{ > +# "qemu":{ > +# "major":0, > +# "minor":11, > +# "micro":5 > +# }, > +# "package":"" > +# } > +# } > +# > +## > +{ 'command': 'query-version', 'returns': 'VersionInfo' } > + > +## > +# @CommandInfo: > +# > +# Information about a QMP command > +# > +# @name: The command name > +# > +# Since: 0.14.0 > +## > +{ 'struct': 'CommandInfo', 'data': {'name': 'str'} } > + > +## > +# @query-commands: > +# > +# Return a list of supported QMP commands by this server > +# > +# Returns: A list of @CommandInfo for all supported commands > +# > +# Since: 0.14.0 > +# > +# Example: > +# > +# -> { "execute": "query-commands" } > +# <- { > +# "return":[ > +# { > +# "name":"query-balloon" > +# }, > +# { > +# "name":"system_powerdown" > +# } > +# ] > +# } > +# > +# Note: This example has been shortened as the real response is too long. > +# > +## > +{ 'command': 'query-commands', 'returns': ['CommandInfo'] } > + > +## > # @LostTickPolicy: > # > # Policy for handling lost ticks in timer devices. > diff --git a/qapi/common.json b/qapi/common.json > index fc72d7e..0c67e4a 100644 > --- a/qapi/common.json > +++ b/qapi/common.json > @@ -29,109 +29,6 @@ > 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] } > > ## > -# @VersionTriple: > -# > -# A three-part version number. > -# > -# @major: The major version number. > -# > -# @minor: The minor version number. > -# > -# @micro: The micro version number. > -# > -# Since: 2.4 > -## > -{ 'struct': 'VersionTriple', > - 'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} } > - > - > -## > -# @VersionInfo: > -# > -# A description of QEMU's version. > -# > -# @qemu: The version of QEMU. By current convention, a micro > -# version of 50 signifies a development branch. A micro > version > -# greater than or equal to 90 signifies a release candidate > for > -# the next minor version. A micro version of less than 50 > -# signifies a stable release. > -# > -# @package: QEMU will always set this field to an empty string. > Downstream > -# versions of QEMU should set this to a non-empty string. > The > -# exact format depends on the downstream however it highly > -# recommended that a unique name is used. > -# > -# Since: 0.14.0 > -## > -{ 'struct': 'VersionInfo', > - 'data': {'qemu': 'VersionTriple', 'package': 'str'} } > - > -## > -# @query-version: > -# > -# Returns the current version of QEMU. > -# > -# Returns: A @VersionInfo object describing the current version of QEMU. > -# > -# Since: 0.14.0 > -# > -# Example: > -# > -# -> { "execute": "query-version" } > -# <- { > -# "return":{ > -# "qemu":{ > -# "major":0, > -# "minor":11, > -# "micro":5 > -# }, > -# "package":"" > -# } > -# } > -# > -## > -{ 'command': 'query-version', 'returns': 'VersionInfo' } > - > -## > -# @CommandInfo: > -# > -# Information about a QMP command > -# > -# @name: The command name > -# > -# Since: 0.14.0 > -## > -{ 'struct': 'CommandInfo', 'data': {'name': 'str'} } > - > -## > -# @query-commands: > -# > -# Return a list of supported QMP commands by this server > -# > -# Returns: A list of @CommandInfo for all supported commands > -# > -# Since: 0.14.0 > -# > -# Example: > -# > -# -> { "execute": "query-commands" } > -# <- { > -# "return":[ > -# { > -# "name":"query-balloon" > -# }, > -# { > -# "name":"system_powerdown" > -# } > -# ] > -# } > -# > -# Note: This example has been shortened as the real response is too long. > -# > -## > -{ 'command': 'query-commands', 'returns': ['CommandInfo'] } > - > -## > # @IoOperationType: > # > # An enumeration of the I/O operation types > -- > 2.7.5 > > > -- Marc-André Lureau