From a2ff5a48c4623be422f6271dd95ce047af0df3ec Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 24 Aug 2017 21:13:56 +0200 Subject: qapi-schema: Collect sockets stuff in qapi/sockets.json Cc: "Daniel P. Berrange" Cc: Gerd Hoffmann Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Message-Id: <1503602048-12268-5-git-send-email-armbru@redhat.com> Reviewed-by: Marc-André Lureau --- qapi/block-core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qapi/block-core.json') diff --git a/qapi/block-core.json b/qapi/block-core.json index 833c602150..5379674292 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4,8 +4,8 @@ # == QAPI block core definitions (vm unrelated) ## -# QAPI common definitions { 'include': 'common.json' } +{ 'include': 'sockets.json' } ## # @SnapshotInfo: -- cgit v1.2.3-55-g7522 From 2031c133ed5197c9c6eaf6755dcc439e8dbc0385 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 24 Aug 2017 21:14:06 +0200 Subject: qapi-schema: Make block-core.json self-contained Except for block-core.json, the sub-schemas are self-contained: if they use a symbol defined in another sub-schema, they include that sub-schema. To check, feed the sub-schema to qapi2texi (or any other QAPI generator) along with the pragma from qapi-schema.json. Fix up things to make block-core.json self-contained, too. Signed-off-by: Markus Armbruster Message-Id: <1503602048-12268-15-git-send-email-armbru@redhat.com> Reviewed-by: Marc-André Lureau --- qapi-schema.json | 14 -------------- qapi/block-core.json | 1 + qapi/common.json | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 14 deletions(-) (limited to 'qapi/block-core.json') diff --git a/qapi-schema.json b/qapi-schema.json index 4964d927bd..80c15dade3 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2815,20 +2815,6 @@ { 'event': 'ACPI_DEVICE_OST', 'data': { 'info': 'ACPIOSTInfo' } } -## -# @IoOperationType: -# -# An enumeration of the I/O operation types -# -# @read: read operation -# -# @write: write operation -# -# Since: 2.1 -## -{ 'enum': 'IoOperationType', - 'data': [ 'read', 'write' ] } - ## # @rtc-reset-reinjection: # diff --git a/qapi/block-core.json b/qapi/block-core.json index 5379674292..f4caa5c21b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5,6 +5,7 @@ ## { 'include': 'common.json' } +{ 'include': 'crypto.json' } { 'include': 'sockets.json' } ## diff --git a/qapi/common.json b/qapi/common.json index e2c58564d8..fc72d7ec3d 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -131,6 +131,20 @@ ## { 'command': 'query-commands', 'returns': ['CommandInfo'] } +## +# @IoOperationType: +# +# An enumeration of the I/O operation types +# +# @read: read operation +# +# @write: write operation +# +# Since: 2.1 +## +{ 'enum': 'IoOperationType', + 'data': [ 'read', 'write' ] } + ## # @OnOffAuto: # -- cgit v1.2.3-55-g7522 From f5cf31c5758b9ab8b77f4d6ccd3ffe43036c5480 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 24 Aug 2017 21:14:08 +0200 Subject: qapi-schema: Improve section headings The generated QEMU QMP reference is now structured as follows: 1.1 Introduction 1.2 Stability Considerations 1.3 Common data types 1.4 Socket data types 1.5 VM run state 1.6 Cryptography 1.7 Block devices 1.7.1 Block core (VM unrelated) 1.7.2 QAPI block definitions (vm unrelated) 1.8 Character devices 1.9 Net devices 1.10 Rocker switch device 1.11 TPM (trusted platform module) devices 1.12 Remote desktop 1.12.1 Spice 1.12.2 VNC 1.13 Input 1.14 Migration 1.15 Transactions 1.16 Tracing 1.17 QMP introspection 1.18 Miscellanea Section "1.18 Miscellanea" is still too big: it documents 134 symbols. Section "1.7.1 Block core (VM unrelated)" is also rather big: 128 symbols. All the others are of reasonable size. Signed-off-by: Markus Armbruster Message-Id: <1503602048-12268-17-git-send-email-armbru@redhat.com> Reviewed-by: Marc-André Lureau --- qapi-schema.json | 2 +- qapi/block-core.json | 2 +- qapi/block.json | 5 ++--- qapi/common.json | 2 +- qapi/crypto.json | 2 +- qapi/trace.json | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) (limited to 'qapi/block-core.json') diff --git a/qapi-schema.json b/qapi-schema.json index 7a393ec3e9..f3af2cb851 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -94,7 +94,7 @@ { 'include': 'qapi/introspect.json' } ## -# = QMP commands +# = Miscellanea ## ## diff --git a/qapi/block-core.json b/qapi/block-core.json index f4caa5c21b..28abb9e6cf 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1,7 +1,7 @@ # -*- Mode: Python -*- ## -# == QAPI block core definitions (vm unrelated) +# == Block core (VM unrelated) ## { 'include': 'common.json' } diff --git a/qapi/block.json b/qapi/block.json index 8ce335739f..f093fa3f27 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -1,14 +1,13 @@ # -*- Mode: Python -*- ## -# = QAPI block definitions +# = Block devices ## -# QAPI block core definitions { 'include': 'block-core.json' } ## -# == QAPI block definitions (vm unrelated) +# == Additional block stuff (VM related) ## ## diff --git a/qapi/common.json b/qapi/common.json index 0c67e4acf5..6eb01821ef 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -1,7 +1,7 @@ # -*- Mode: Python -*- ## -# = QAPI common definitions +# = Common data types ## ## diff --git a/qapi/crypto.json b/qapi/crypto.json index 6b6fde367a..288bc056ef 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -2,7 +2,7 @@ # ## -# = QAPI crypto definitions +# = Cryptography ## ## diff --git a/qapi/trace.json b/qapi/trace.json index de6588d9f7..799b254a18 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -6,7 +6,7 @@ # See the COPYING file in the top-level directory. ## -# = Tracing commands +# = Tracing ## ## -- cgit v1.2.3-55-g7522