From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 32/33] docs/qapi-code-gen.txt: Fix QAPI schema examples
Date: Fri, 4 Sep 2015 16:21:39 +0200 [thread overview]
Message-ID: <1441376500-14784-33-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1441376500-14784-1-git-send-email-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
docs/qapi-code-gen.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index b4d4a01..ff16df2 100644
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -300,7 +300,6 @@ an implicit C enum 'NameKind' is created, corresponding to the union
the union can be named 'max', as this would collide with the implicit
enum. The value for each branch can be of any type.
-
A flat union definition specifies a struct as its base, and
avoids nesting on the wire. All branches of the union must be
complex types, and the top-level fields of the union dictionary on
@@ -314,7 +313,7 @@ adding a common field 'readonly', renaming the discriminator to
something more applicable, and reducing the number of {} required on
the wire:
- { 'enum': 'BlockdevDriver', 'data': [ 'raw', 'qcow2' ] }
+ { 'enum': 'BlockdevDriver', 'data': [ 'file', 'qcow2' ] }
{ 'struct': 'BlockdevCommonOptions',
'data': { 'driver': 'BlockdevDriver', 'readonly': 'bool' } }
{ 'union': 'BlockdevOptions',
@@ -350,7 +349,7 @@ is identical on the wire to:
{ 'struct': 'Base', 'data': { 'type': 'Enum' } }
{ 'struct': 'Branch1', 'data': { 'data': 'str' } }
{ 'struct': 'Branch2', 'data': { 'data': 'int' } }
- { 'union': 'Flat': 'base': 'Base', 'discriminator': 'type',
+ { 'union': 'Flat', 'base': 'Base', 'discriminator': 'type',
'data': { 'one': 'Branch1', 'two': 'Branch2' } }
--
2.4.3
next prev parent reply other threads:[~2015-09-04 14:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 14:21 [Qemu-devel] [PULL 00/33] qapi: Another round of fixes and cleanups Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 01/33] qapi: Clarify docs on including the same file multiple times Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 02/33] qapi: Clean up cgen() and mcgen() Markus Armbruster
2015-09-07 12:42 ` Laurent Desnogues
2015-09-07 14:55 ` Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 03/33] qapi: Simplify guardname() Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 04/33] qapi-event: Clean up how name of enum QAPIEvent is made Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 05/33] qapi: Reject -p arguments that break qapi-event.py Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 06/33] qapi: Drop unused and useless parameters and variables Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 07/33] qapi: Fix generated code when flat union has member 'kind' Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 08/33] qapi: Generate a nicer struct for flat unions Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 09/33] qapi-visit: Fix generated code when schema has forward refs Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 10/33] qapi-visit: Replace list implicit_structs by set Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 11/33] qapi-visit: Fix two name arguments passed to visitors Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 12/33] tests/qapi-schema: Document alternate's enum lacks visit function Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 13/33] tests/qapi-schema: Document events with base don't work Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 14/33] qapi: Document that input visitor semantics are prone to leaks Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 15/33] qapi: Document shortcoming with union 'data' branch Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 16/33] qapi: Document flaws in checking of names Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 17/33] tests/qapi-schema: Restore test case for flat union base bug Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 18/33] tests/qapi-schema: Rename tests from data- to args- Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 19/33] qapi-tests: New tests for union, alternate command arguments Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 20/33] qapi: Fix to reject union command and event arguments Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 21/33] qapi: Command returning anonymous type doesn't work, outlaw Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 22/33] qapi-commands: Fix gen_err_check(e) for e and e != 'local_err' Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 23/33] qapi-commands: Inline gen_marshal_output_call() Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 24/33] qapi-commands: Don't feed output of mcgen() to mcgen() again Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 25/33] qapi-commands: Drop useless initialization Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 26/33] qapi: Generated code cleanup Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 27/33] qapi: Drop one of two "simple union must not have base" checks Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 28/33] tests/qapi-schema: Cover two more syntax errors Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 29/33] tests/qapi-schema: Cover non-string, non-dictionary members Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 30/33] qapi: Fix errors for " Markus Armbruster
2015-09-04 14:21 ` [Qemu-devel] [PULL 31/33] qapi: Simplify error reporting for array types Markus Armbruster
2015-09-04 14:21 ` Markus Armbruster [this message]
2015-09-04 14:21 ` [Qemu-devel] [PULL 33/33] qapi: Generators crash when --output-dir isn't given, fix Markus Armbruster
2015-09-04 16:37 ` [Qemu-devel] [PULL 00/33] qapi: Another round of fixes and cleanups Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441376500-14784-33-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).