{"id":808758,"url":"http://patchwork.ozlabs.org/api/patches/808758/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-29-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-29-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:39","name":"[PULL,v2,28/47] qapi-schema: Fold event.json back into qapi-schema.json","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"327adb989dd0d3f89f2973c9fd02a849a56ca69a","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-29-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/808758/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808758/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=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xkP530575z9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:57:11 +1000 (AEST)","from localhost ([::1]:46570 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoJh-0008E1-4K\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:57:09 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51546)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1N-0006fK-Ly\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 ) id 1dno1L-0001hs-CD\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:13 -0400","from mx1.redhat.com ([209.132.183.28]:50880)\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-0001ga-1f\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 022F2C057FA1\n\tfor ; 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 9A8BA7FB9F\n\tfor ; Fri, 1 Sep 2017 15:38:09 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 958641132F3D; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 022F2C057FA1","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:39 +0200","Message-Id":"<20170901153758.8628-29-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.32]);\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 28/47] qapi-schema: Fold event.json back into\n\tqapi-schema.json","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":"Signed-off-by: Markus Armbruster \nMessage-Id: <1503602048-12268-14-git-send-email-armbru@redhat.com>\nReviewed-by: Marc-André Lureau \n---\n Makefile | 2 +-\n qapi-schema.json | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++-\n qapi/event.json | 138 -------------------------------------------------------\n 3 files changed, 134 insertions(+), 140 deletions(-)\n delete mode 100644 qapi/event.json","diff":"diff --git a/Makefile b/Makefile\nindex 3dde210662..337a1f6f9b 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -412,7 +412,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \\\n $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \\\n $(SRC_PATH)/qapi/char.json \\\n $(SRC_PATH)/qapi/crypto.json \\\n- $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json \\\n+ $(SRC_PATH)/qapi/introspect.json \\\n $(SRC_PATH)/qapi/migration.json \\\n $(SRC_PATH)/qapi/net.json \\\n $(SRC_PATH)/qapi/rocker.json \\\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex 0ad4e0237d..4964d927bd 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -90,7 +90,6 @@\n { 'include': 'qapi/ui.json' }\n { 'include': 'qapi/migration.json' }\n { 'include': 'qapi/transaction.json' }\n-{ 'include': 'qapi/event.json' }\n { 'include': 'qapi/trace.json' }\n { 'include': 'qapi/introspect.json' }\n \n@@ -552,6 +551,28 @@\n { 'command': 'query-balloon', 'returns': 'BalloonInfo' }\n \n ##\n+# @BALLOON_CHANGE:\n+#\n+# Emitted when the guest changes the actual BALLOON level. This value is\n+# equivalent to the @actual field return by the 'query-balloon' command\n+#\n+# @actual: actual level of the guest memory balloon in bytes\n+#\n+# Note: this event is rate-limited.\n+#\n+# Since: 1.2\n+#\n+# Example:\n+#\n+# <- { \"event\": \"BALLOON_CHANGE\",\n+# \"data\": { \"actual\": 944766976 },\n+# \"timestamp\": { \"seconds\": 1267020223, \"microseconds\": 435656 } }\n+#\n+##\n+{ 'event': 'BALLOON_CHANGE',\n+ 'data': { 'actual': 'int' } }\n+\n+##\n # @PciMemoryRange:\n #\n # A PCI device memory region\n@@ -1434,6 +1455,30 @@\n { 'command': 'device_del', 'data': {'id': 'str'} }\n \n ##\n+# @DEVICE_DELETED:\n+#\n+# Emitted whenever the device removal completion is acknowledged by the guest.\n+# At this point, it's safe to reuse the specified device ID. Device removal can\n+# be initiated by the guest or by HMP/QMP commands.\n+#\n+# @device: device name\n+#\n+# @path: device path\n+#\n+# Since: 1.5\n+#\n+# Example:\n+#\n+# <- { \"event\": \"DEVICE_DELETED\",\n+# \"data\": { \"device\": \"virtio-net-pci-0\",\n+# \"path\": \"/machine/peripheral/virtio-net-pci-0\" },\n+# \"timestamp\": { \"seconds\": 1265044230, \"microseconds\": 450486 } }\n+#\n+##\n+{ 'event': 'DEVICE_DELETED',\n+ 'data': { '*device': 'str', 'path': 'str' } }\n+\n+##\n # @DumpGuestMemoryFormat:\n #\n # An enumeration of guest-memory-dump's format.\n@@ -1569,6 +1614,29 @@\n { 'command': 'query-dump', 'returns': 'DumpQueryResult' }\n \n ##\n+# @DUMP_COMPLETED:\n+#\n+# Emitted when background dump has completed\n+#\n+# @result: DumpQueryResult type described in qapi-schema.json.\n+#\n+# @error: human-readable error string that provides\n+# hint on why dump failed. Only presents on failure. The\n+# user should not try to interpret the error string.\n+#\n+# Since: 2.6\n+#\n+# Example:\n+#\n+# { \"event\": \"DUMP_COMPLETED\",\n+# \"data\": {\"result\": {\"total\": 1090650112, \"status\": \"completed\",\n+# \"completed\": 1090650112} } }\n+#\n+##\n+{ 'event': 'DUMP_COMPLETED' ,\n+ 'data': { 'result': 'DumpQueryResult', '*error': 'str' } }\n+\n+##\n # @DumpGuestMemoryCapability:\n #\n # A list of the available formats for dump-guest-memory\n@@ -2652,6 +2720,29 @@\n { 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }\n \n ##\n+# @MEM_UNPLUG_ERROR:\n+#\n+# Emitted when memory hot unplug error occurs.\n+#\n+# @device: device name\n+#\n+# @msg: Informative message\n+#\n+# Since: 2.4\n+#\n+# Example:\n+#\n+# <- { \"event\": \"MEM_UNPLUG_ERROR\"\n+# \"data\": { \"device\": \"dimm1\",\n+# \"msg\": \"acpi: device unplug for unsupported device\"\n+# },\n+# \"timestamp\": { \"seconds\": 1265044230, \"microseconds\": 450486 } }\n+#\n+##\n+{ 'event': 'MEM_UNPLUG_ERROR',\n+ 'data': { 'device': 'str', 'msg': 'str' } }\n+\n+##\n # @ACPISlotType:\n #\n # @DIMM: memory slot\n@@ -2706,6 +2797,25 @@\n { 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }\n \n ##\n+# @ACPI_DEVICE_OST:\n+#\n+# Emitted when guest executes ACPI _OST method.\n+#\n+# @info: ACPIOSTInfo type as described in qapi-schema.json\n+#\n+# Since: 2.1\n+#\n+# Example:\n+#\n+# <- { \"event\": \"ACPI_DEVICE_OST\",\n+# \"data\": { \"device\": \"d1\", \"slot\": \"0\",\n+# \"slot-type\": \"DIMM\", \"source\": 1, \"status\": 0 } }\n+#\n+##\n+{ 'event': 'ACPI_DEVICE_OST',\n+ 'data': { 'info': 'ACPIOSTInfo' } }\n+\n+##\n # @IoOperationType:\n #\n # An enumeration of the I/O operation types\n@@ -2738,6 +2848,28 @@\n { 'command': 'rtc-reset-reinjection' }\n \n ##\n+# @RTC_CHANGE:\n+#\n+# Emitted when the guest changes the RTC time.\n+#\n+# @offset: offset between base RTC clock (as specified by -rtc base), and\n+# new RTC clock value\n+#\n+# Note: This event is rate-limited.\n+#\n+# Since: 0.13.0\n+#\n+# Example:\n+#\n+# <- { \"event\": \"RTC_CHANGE\",\n+# \"data\": { \"offset\": 78 },\n+# \"timestamp\": { \"seconds\": 1267020223, \"microseconds\": 435656 } }\n+#\n+##\n+{ 'event': 'RTC_CHANGE',\n+ 'data': { 'offset': 'int' } }\n+\n+##\n # @ReplayMode:\n #\n # Mode of the replay subsystem.\ndiff --git a/qapi/event.json b/qapi/event.json\ndeleted file mode 100644\nindex 48a5d8fb21..0000000000\n--- a/qapi/event.json\n+++ /dev/null\n@@ -1,138 +0,0 @@\n-# -*- Mode: Python -*-\n-\n-##\n-# = Other events\n-##\n-\n-##\n-# @RTC_CHANGE:\n-#\n-# Emitted when the guest changes the RTC time.\n-#\n-# @offset: offset between base RTC clock (as specified by -rtc base), and\n-# new RTC clock value\n-#\n-# Note: This event is rate-limited.\n-#\n-# Since: 0.13.0\n-#\n-# Example:\n-#\n-# <- { \"event\": \"RTC_CHANGE\",\n-# \"data\": { \"offset\": 78 },\n-# \"timestamp\": { \"seconds\": 1267020223, \"microseconds\": 435656 } }\n-#\n-##\n-{ 'event': 'RTC_CHANGE',\n- 'data': { 'offset': 'int' } }\n-\n-##\n-# @DEVICE_DELETED:\n-#\n-# Emitted whenever the device removal completion is acknowledged by the guest.\n-# At this point, it's safe to reuse the specified device ID. Device removal can\n-# be initiated by the guest or by HMP/QMP commands.\n-#\n-# @device: device name\n-#\n-# @path: device path\n-#\n-# Since: 1.5\n-#\n-# Example:\n-#\n-# <- { \"event\": \"DEVICE_DELETED\",\n-# \"data\": { \"device\": \"virtio-net-pci-0\",\n-# \"path\": \"/machine/peripheral/virtio-net-pci-0\" },\n-# \"timestamp\": { \"seconds\": 1265044230, \"microseconds\": 450486 } }\n-#\n-##\n-{ 'event': 'DEVICE_DELETED',\n- 'data': { '*device': 'str', 'path': 'str' } }\n-\n-##\n-# @ACPI_DEVICE_OST:\n-#\n-# Emitted when guest executes ACPI _OST method.\n-#\n-# @info: ACPIOSTInfo type as described in qapi-schema.json\n-#\n-# Since: 2.1\n-#\n-# Example:\n-#\n-# <- { \"event\": \"ACPI_DEVICE_OST\",\n-# \"data\": { \"device\": \"d1\", \"slot\": \"0\",\n-# \"slot-type\": \"DIMM\", \"source\": 1, \"status\": 0 } }\n-#\n-##\n-{ 'event': 'ACPI_DEVICE_OST',\n- 'data': { 'info': 'ACPIOSTInfo' } }\n-\n-##\n-# @BALLOON_CHANGE:\n-#\n-# Emitted when the guest changes the actual BALLOON level. This value is\n-# equivalent to the @actual field return by the 'query-balloon' command\n-#\n-# @actual: actual level of the guest memory balloon in bytes\n-#\n-# Note: this event is rate-limited.\n-#\n-# Since: 1.2\n-#\n-# Example:\n-#\n-# <- { \"event\": \"BALLOON_CHANGE\",\n-# \"data\": { \"actual\": 944766976 },\n-# \"timestamp\": { \"seconds\": 1267020223, \"microseconds\": 435656 } }\n-#\n-##\n-{ 'event': 'BALLOON_CHANGE',\n- 'data': { 'actual': 'int' } }\n-\n-##\n-# @MEM_UNPLUG_ERROR:\n-#\n-# Emitted when memory hot unplug error occurs.\n-#\n-# @device: device name\n-#\n-# @msg: Informative message\n-#\n-# Since: 2.4\n-#\n-# Example:\n-#\n-# <- { \"event\": \"MEM_UNPLUG_ERROR\"\n-# \"data\": { \"device\": \"dimm1\",\n-# \"msg\": \"acpi: device unplug for unsupported device\"\n-# },\n-# \"timestamp\": { \"seconds\": 1265044230, \"microseconds\": 450486 } }\n-#\n-##\n-{ 'event': 'MEM_UNPLUG_ERROR',\n- 'data': { 'device': 'str', 'msg': 'str' } }\n-\n-##\n-# @DUMP_COMPLETED:\n-#\n-# Emitted when background dump has completed\n-#\n-# @result: DumpQueryResult type described in qapi-schema.json.\n-#\n-# @error: human-readable error string that provides\n-# hint on why dump failed. Only presents on failure. The\n-# user should not try to interpret the error string.\n-#\n-# Since: 2.6\n-#\n-# Example:\n-#\n-# { \"event\": \"DUMP_COMPLETED\",\n-# \"data\": {\"result\": {\"total\": 1090650112, \"status\": \"completed\",\n-# \"completed\": 1090650112} } }\n-#\n-##\n-{ 'event': 'DUMP_COMPLETED' ,\n- 'data': { 'result': 'DumpQueryResult', '*error': 'str' } }\n","prefixes":["PULL","v2","28/47"]}