{"id":808753,"url":"http://patchwork.ozlabs.org/api/patches/808753/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-31-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901153758.8628-31-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:41","name":"[PULL,v2,30/47] qapi-schema: Move queries from common.json to qapi-schema.json","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6f2a10c03e5f968e66555f54cb4e5e63aaf300ee","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-31-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808753/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808753/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkP1w2DpXz9t3P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat,  2 Sep 2017 01:54:28 +1000 (AEST)","from localhost ([::1]:46556 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnoH4-0005oZ-Cs\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:54:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51532)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1N-0006eT-58\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:17 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <armbru@redhat.com>) id 1dno1L-0001iB-IQ\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:13 -0400","from mx1.redhat.com ([209.132.183.28]:58408)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <armbru@redhat.com>) id 1dno1L-0001gz-5H\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 205AB7E430\n\tfor <qemu-devel@nongnu.org>; Fri,  1 Sep 2017 15:38:10 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id BBD2B17C78\n\tfor <qemu-devel@nongnu.org>; Fri,  1 Sep 2017 15:38:09 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 9B2771132F3F; Fri,  1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 205AB7E430","From":"Markus Armbruster <armbru@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Fri,  1 Sep 2017 17:37:41 +0200","Message-Id":"<20170901153758.8628-31-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tFri, 01 Sep 2017 15:38:10 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 30/47] qapi-schema: Move queries from\n\tcommon.json to qapi-schema.json","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"query-version and query-commands are in common.json for no good\nreason.  Several similar queries are in qapi-schema.json.  Move them\nthere.\n\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <1503602048-12268-16-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\n---\n qapi-schema.json | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n qapi/common.json | 103 -------------------------------------------------------\n 2 files changed, 103 insertions(+), 103 deletions(-)","diff":"diff --git a/qapi-schema.json b/qapi-schema.json\nindex 80c15dade3..7a393ec3e9 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -119,6 +119,109 @@\n { 'command': 'qmp_capabilities' }\n \n ##\n+# @VersionTriple:\n+#\n+# A three-part version number.\n+#\n+# @major:  The major version number.\n+#\n+# @minor:  The minor version number.\n+#\n+# @micro:  The micro version number.\n+#\n+# Since: 2.4\n+##\n+{ 'struct': 'VersionTriple',\n+  'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} }\n+\n+\n+##\n+# @VersionInfo:\n+#\n+# A description of QEMU's version.\n+#\n+# @qemu:        The version of QEMU.  By current convention, a micro\n+#               version of 50 signifies a development branch.  A micro version\n+#               greater than or equal to 90 signifies a release candidate for\n+#               the next minor version.  A micro version of less than 50\n+#               signifies a stable release.\n+#\n+# @package:     QEMU will always set this field to an empty string.  Downstream\n+#               versions of QEMU should set this to a non-empty string.  The\n+#               exact format depends on the downstream however it highly\n+#               recommended that a unique name is used.\n+#\n+# Since: 0.14.0\n+##\n+{ 'struct': 'VersionInfo',\n+  'data': {'qemu': 'VersionTriple', 'package': 'str'} }\n+\n+##\n+# @query-version:\n+#\n+# Returns the current version of QEMU.\n+#\n+# Returns:  A @VersionInfo object describing the current version of QEMU.\n+#\n+# Since: 0.14.0\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-version\" }\n+# <- {\n+#       \"return\":{\n+#          \"qemu\":{\n+#             \"major\":0,\n+#             \"minor\":11,\n+#             \"micro\":5\n+#          },\n+#          \"package\":\"\"\n+#       }\n+#    }\n+#\n+##\n+{ 'command': 'query-version', 'returns': 'VersionInfo' }\n+\n+##\n+# @CommandInfo:\n+#\n+# Information about a QMP command\n+#\n+# @name: The command name\n+#\n+# Since: 0.14.0\n+##\n+{ 'struct': 'CommandInfo', 'data': {'name': 'str'} }\n+\n+##\n+# @query-commands:\n+#\n+# Return a list of supported QMP commands by this server\n+#\n+# Returns: A list of @CommandInfo for all supported commands\n+#\n+# Since: 0.14.0\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-commands\" }\n+# <- {\n+#      \"return\":[\n+#         {\n+#            \"name\":\"query-balloon\"\n+#         },\n+#         {\n+#            \"name\":\"system_powerdown\"\n+#         }\n+#      ]\n+#    }\n+#\n+# Note: This example has been shortened as the real response is too long.\n+#\n+##\n+{ 'command': 'query-commands', 'returns': ['CommandInfo'] }\n+\n+##\n # @LostTickPolicy:\n #\n # Policy for handling lost ticks in timer devices.\ndiff --git a/qapi/common.json b/qapi/common.json\nindex fc72d7ec3d..0c67e4acf5 100644\n--- a/qapi/common.json\n+++ b/qapi/common.json\n@@ -29,109 +29,6 @@\n             'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }\n \n ##\n-# @VersionTriple:\n-#\n-# A three-part version number.\n-#\n-# @major:  The major version number.\n-#\n-# @minor:  The minor version number.\n-#\n-# @micro:  The micro version number.\n-#\n-# Since: 2.4\n-##\n-{ 'struct': 'VersionTriple',\n-  'data': {'major': 'int', 'minor': 'int', 'micro': 'int'} }\n-\n-\n-##\n-# @VersionInfo:\n-#\n-# A description of QEMU's version.\n-#\n-# @qemu:        The version of QEMU.  By current convention, a micro\n-#               version of 50 signifies a development branch.  A micro version\n-#               greater than or equal to 90 signifies a release candidate for\n-#               the next minor version.  A micro version of less than 50\n-#               signifies a stable release.\n-#\n-# @package:     QEMU will always set this field to an empty string.  Downstream\n-#               versions of QEMU should set this to a non-empty string.  The\n-#               exact format depends on the downstream however it highly\n-#               recommended that a unique name is used.\n-#\n-# Since: 0.14.0\n-##\n-{ 'struct': 'VersionInfo',\n-  'data': {'qemu': 'VersionTriple', 'package': 'str'} }\n-\n-##\n-# @query-version:\n-#\n-# Returns the current version of QEMU.\n-#\n-# Returns:  A @VersionInfo object describing the current version of QEMU.\n-#\n-# Since: 0.14.0\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-version\" }\n-# <- {\n-#       \"return\":{\n-#          \"qemu\":{\n-#             \"major\":0,\n-#             \"minor\":11,\n-#             \"micro\":5\n-#          },\n-#          \"package\":\"\"\n-#       }\n-#    }\n-#\n-##\n-{ 'command': 'query-version', 'returns': 'VersionInfo' }\n-\n-##\n-# @CommandInfo:\n-#\n-# Information about a QMP command\n-#\n-# @name: The command name\n-#\n-# Since: 0.14.0\n-##\n-{ 'struct': 'CommandInfo', 'data': {'name': 'str'} }\n-\n-##\n-# @query-commands:\n-#\n-# Return a list of supported QMP commands by this server\n-#\n-# Returns: A list of @CommandInfo for all supported commands\n-#\n-# Since: 0.14.0\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-commands\" }\n-# <- {\n-#      \"return\":[\n-#         {\n-#            \"name\":\"query-balloon\"\n-#         },\n-#         {\n-#            \"name\":\"system_powerdown\"\n-#         }\n-#      ]\n-#    }\n-#\n-# Note: This example has been shortened as the real response is too long.\n-#\n-##\n-{ 'command': 'query-commands', 'returns': ['CommandInfo'] }\n-\n-##\n # @IoOperationType:\n #\n # An enumeration of the I/O operation types\n","prefixes":["PULL","v2","30/47"]}