mirror of https://gitee.com/openkylin/qemu.git
QAPI patches patches for 2020-11-09
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAl+o+uESHGFybWJydUBy ZWRoYXQuY29tAAoJEDhwtADrkYZTh4gQAIKEdJDHvHpx1ogf8uptJLA6aaWvT2ZR soKboGRIWuyLqY/UFkNdG7vcy8/PwMb3t3eauK06YtAZKBQF911UQoOHpPM0ilvU dpBnyyRaPLsucJvlUFcjpSxsBztGa5O+W+zWjIdMKIV4wRybHnWNXUTGj2j6It3t OAWAgHYSmC0Sav3trj0bfS7QDBwKbyQi2Dd5RaBkHtRZzwNvWwJwaoj9jd1grrya 89FD+mTemh1FosVcT/GCuQ6Lwe6FPGcKJ5XzbCXTm0vItJE+2/5qBDYXp/nu+zkL 5dVybMtsd24XqG9FzijF3+hokwIq9wZljyNgfjJLC0x8iI1pHki7Lc3c52ECiH47 47mxeMTdUGYkTbgU4Ysyp8INEi3UsPDn31axYg+lDMcxgNBL/2PtsyaavDdp9EBQ W4lRmEr932v02kXXV1NS0KpEKad99AYvRJ5Wf3WHSHbFhi+OHVtKDyFrdo3q++tJ jS5SX4Qq0c26hDvHNGs/juXRcoBKxATQvE+/i0nIHXftm+7as3QXRmgfq9ENIVNk nr4CPjhDMtJ4ydxTsgeciTnwdGSe6aWytx8Y1bJ28K6KYSpDS1CsQcT+qh0dbJsN 3PtXeOiAW11pvZ/TIe7dTQ0w5o7mBOb/vD+IQTJUTo5oAdcsDd0nWx+p72nBLggx S9V1/nQuqjgx =190v -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-11-09' into staging QAPI patches patches for 2020-11-09 # gpg: Signature made Mon 09 Nov 2020 08:16:33 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2020-11-09: block: Remove unused BlockDeviceMapEntry qapi/block-core: Improve MapEntry documentation qapi: Fix missing headers in QMP Reference Manual MAINTAINERS: Add QAPI schema modules to their subsystems docs/devel/qapi-code-gen: Fix up examples Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
a2547c1ba9
|
|
@ -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-*
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
##
|
||||
# = Audio
|
||||
##
|
||||
|
||||
##
|
||||
# @AudiodevPerDirectionOptions:
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# -*- Mode: Python -*-
|
||||
# vim: filetype=python
|
||||
#
|
||||
# QAPI authz definitions
|
||||
|
||||
##
|
||||
# = User authorization
|
||||
##
|
||||
|
||||
##
|
||||
# @QAuthZListPolicy:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#
|
||||
|
|
@ -418,35 +426,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:
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue