diff options
| author | Peter Maydell | 2020-11-09 14:55:15 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-11-09 14:55:15 +0100 |
| commit | a2547c1ba911a0c53a10fe02d94a0f539dc064cc (patch) | |
| tree | 6db45fd2a1315717aa759f93de002eab77990395 /docs | |
| parent | Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-fixes-202011... (diff) | |
| parent | block: Remove unused BlockDeviceMapEntry (diff) | |
| download | qemu-a2547c1ba911a0c53a10fe02d94a0f539dc064cc.tar.gz qemu-a2547c1ba911a0c53a10fe02d94a0f539dc064cc.tar.xz qemu-a2547c1ba911a0c53a10fe02d94a0f539dc064cc.zip | |
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>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/devel/qapi-code-gen.txt | 6 |
1 files changed, 4 insertions, 2 deletions
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 |