{"id":808785,"url":"http://patchwork.ozlabs.org/api/patches/808785/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-30-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-30-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:40","name":"[PULL,v2,29/47] qapi-schema: Make block-core.json self-contained","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"34a811fc4ae72172062e47c64e188394064721f0","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-30-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/808785/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808785/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xkPPB56PGz9sRV\n\tfor ;\n\tSat, 2 Sep 2017 02:11:10 +1000 (AEST)","from localhost ([::1]:46876 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoXE-0005nK-Ia\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:11:08 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51653)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1Q-0006g5-GJ\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1L-0001hz-CX\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:16 -0400","from mx1.redhat.com ([209.132.183.28]:34208)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1L-0001gY-4t\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 ED43D7EA9B\n\tfor ; Fri, 1 Sep 2017 15:38:09 +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 BBC3E808E6\n\tfor ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 985971132F3E; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com ED43D7EA9B","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:40 +0200","Message-Id":"<20170901153758.8628-30-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.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\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 29/47] qapi-schema: Make block-core.json\n\tself-contained","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Except for block-core.json, the sub-schemas are self-contained: if\nthey use a symbol defined in another sub-schema, they include that\nsub-schema. To check, feed the sub-schema to qapi2texi (or any other\nQAPI generator) along with the pragma from qapi-schema.json.\n\nFix up things to make block-core.json self-contained, too.\n\nSigned-off-by: Markus Armbruster \nMessage-Id: <1503602048-12268-15-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \n---\n qapi-schema.json | 14 --------------\n qapi/block-core.json | 1 +\n qapi/common.json | 14 ++++++++++++++\n 3 files changed, 15 insertions(+), 14 deletions(-)","diff":"diff --git a/qapi-schema.json b/qapi-schema.json\nindex 4964d927bd..80c15dade3 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -2816,20 +2816,6 @@\n 'data': { 'info': 'ACPIOSTInfo' } }\n \n ##\n-# @IoOperationType:\n-#\n-# An enumeration of the I/O operation types\n-#\n-# @read: read operation\n-#\n-# @write: write operation\n-#\n-# Since: 2.1\n-##\n-{ 'enum': 'IoOperationType',\n- 'data': [ 'read', 'write' ] }\n-\n-##\n # @rtc-reset-reinjection:\n #\n # This command will reset the RTC interrupt reinjection backlog.\ndiff --git a/qapi/block-core.json b/qapi/block-core.json\nindex 5379674292..f4caa5c21b 100644\n--- a/qapi/block-core.json\n+++ b/qapi/block-core.json\n@@ -5,6 +5,7 @@\n ##\n \n { 'include': 'common.json' }\n+{ 'include': 'crypto.json' }\n { 'include': 'sockets.json' }\n \n ##\ndiff --git a/qapi/common.json b/qapi/common.json\nindex e2c58564d8..fc72d7ec3d 100644\n--- a/qapi/common.json\n+++ b/qapi/common.json\n@@ -132,6 +132,20 @@\n { 'command': 'query-commands', 'returns': ['CommandInfo'] }\n \n ##\n+# @IoOperationType:\n+#\n+# An enumeration of the I/O operation types\n+#\n+# @read: read operation\n+#\n+# @write: write operation\n+#\n+# Since: 2.1\n+##\n+{ 'enum': 'IoOperationType',\n+ 'data': [ 'read', 'write' ] }\n+\n+##\n # @OnOffAuto:\n #\n # An enumeration of three options: on, off, and auto\n","prefixes":["PULL","v2","29/47"]}