diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | docs/devel/qapi-code-gen.txt | 6 | ||||
| -rw-r--r-- | qapi/audio.json | 4 | ||||
| -rw-r--r-- | qapi/authz.json | 6 | ||||
| -rw-r--r-- | qapi/block-core.json | 47 |
5 files changed, 31 insertions, 38 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3f4b6e29df..0e60109d28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1913,6 +1913,7 @@ Rocker M: Jiri Pirko <jiri@resnulli.us> S: Maintained F: hw/net/rocker/ +F: qapi/rocker.json F: tests/rocker/ F: docs/specs/rocker.txt @@ -2115,6 +2116,7 @@ S: Maintained F: audio/ F: hw/audio/ F: include/hw/audio/ +F: qapi/audio.json F: tests/qtest/ac97-test.c F: tests/qtest/es1370-test.c F: tests/qtest/intel-hda-test.c @@ -2494,7 +2496,9 @@ F: monitor/monitor-internal.h F: monitor/qmp* F: monitor/misc.c F: monitor/monitor.c +F: qapi/control.json F: qapi/error.json +F: qapi/introspect.json F: docs/devel/*qmp-* F: docs/interop/*qmp-* F: scripts/qmp/ @@ -2555,6 +2559,7 @@ S: Maintained F: trace/ F: trace-events F: docs/qemu-option-trace.rst.inc +F: qapi/trace.json F: scripts/tracetool.py F: scripts/tracetool/ F: scripts/qemu-trace-stap* @@ -2614,6 +2619,7 @@ M: Daniel P. Berrange <berrange@redhat.com> S: Maintained F: crypto/ F: include/crypto/ +F: qapi/crypto.json F: tests/test-crypto-* F: tests/benchmark-crypto-* F: tests/crypto-tls-* diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index c6438c6aa9..6906a06ad2 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -393,7 +393,7 @@ is identical on the wire to: { 'enum': 'Enum', 'data': ['one', 'two'] } { 'struct': 'Branch1', 'data': { 'data': 'str' } } { 'struct': 'Branch2', 'data': { 'data': 'int' } } - { 'union': 'Flat': 'base': { 'type': 'Enum' }, 'discriminator': 'type', + { 'union': 'Flat', 'base': { 'type': 'Enum' }, 'discriminator': 'type', 'data': { 'one': 'Branch1', 'two': 'Branch2' } } The optional 'if' member specifies a conditional. See "Configuring @@ -590,6 +590,8 @@ When in doubt, do not implement OOB execution support. Member 'allow-preconfig' declares whether the command is available before the machine is built. It defaults to false. For example: + { 'enum': 'QMPCapability', + 'data': [ 'oob' ] } { 'command': 'qmp_capabilities', 'data': { '*enable': [ 'QMPCapability' ] }, 'allow-preconfig': true } @@ -824,7 +826,7 @@ Example: a struct with conditional feature 'allow-negative-numbers' { 'struct': 'TestType', 'data': { 'number': 'int' }, 'features': [ { 'name': 'allow-negative-numbers', - 'if' 'defined(IFCOND)' } ] } + 'if': 'defined(IFCOND)' } ] } Please note that you are responsible to ensure that the C code will compile with an arbitrary combination of conditions, since the diff --git a/qapi/audio.json b/qapi/audio.json index 3b843878d2..072ed79def 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -6,6 +6,10 @@ # See the COPYING file in the top-level directory. ## +# = Audio +## + +## # @AudiodevPerDirectionOptions: # # General audio backend options that are used for both playback and diff --git a/qapi/authz.json b/qapi/authz.json index f3e9745426..42afe752d1 100644 --- a/qapi/authz.json +++ b/qapi/authz.json @@ -1,7 +1,9 @@ # -*- Mode: Python -*- # vim: filetype=python -# -# QAPI authz definitions + +## +# = User authorization +## ## # @QAuthZListPolicy: diff --git a/qapi/block-core.json b/qapi/block-core.json index 1b8b4156b4..04ad80bc1e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -244,17 +244,25 @@ # # Mapping information from a virtual block range to a host file range # -# @start: the start byte of the mapped virtual range +# @start: virtual (guest) offset of the first byte described by this +# entry # # @length: the number of bytes of the mapped virtual range # -# @data: whether the mapped range has data +# @data: reading the image will actually read data from a file (in +# particular, if @offset is present this means that the sectors +# are not simply preallocated, but contain actual data in raw +# format) # -# @zero: whether the virtual blocks are zeroed +# @zero: whether the virtual blocks read as zeroes # -# @depth: the depth of the mapping +# @depth: number of layers (0 = top image, 1 = top image's backing +# file, ..., n - 1 = bottom image (where n is the number of +# images in the chain)) before reaching one for which the +# range is allocated # -# @offset: the offset in file that the virtual sectors are mapped to +# @offset: if present, the image file stores the data for this range +# in raw format at the given (host) offset # # @filename: filename that is referred to by @offset # @@ -419,35 +427,6 @@ { 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } ## -# @BlockDeviceMapEntry: -# -# Entry in the metadata map of the device (returned by "qemu-img map") -# -# @start: Offset in the image of the first byte described by this entry -# (in bytes) -# -# @length: Length of the range described by this entry (in bytes) -# -# @depth: Number of layers (0 = top image, 1 = top image's backing file, etc.) -# before reaching one for which the range is allocated. The value is -# in the range 0 to the depth of the image chain - 1. -# -# @zero: the sectors in this range read as zeros -# -# @data: reading the image will actually read data from a file (in particular, -# if @offset is present this means that the sectors are not simply -# preallocated, but contain actual data in raw format) -# -# @offset: if present, the image file stores the data for this range in -# raw format at the given offset. -# -# Since: 1.7 -## -{ 'struct': 'BlockDeviceMapEntry', - 'data': { 'start': 'int', 'length': 'int', 'depth': 'int', 'zero': 'bool', - 'data': 'bool', '*offset': 'int' } } - -## # @DirtyBitmapStatus: # # An enumeration of possible states that a dirty bitmap can report to the user. |