diff options
| author | Peter Maydell | 2015-09-21 23:33:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-21 23:33:51 +0200 |
| commit | 9e72681d16792d0ffc42bab634b1753ff299bdfd (patch) | |
| tree | 4b73c0b5685250599051e7f0c20ddfad784972da /tests/qapi-schema/args-member-array.out | |
| parent | Merge remote-tracking branch 'remotes/aurel/tags/pull-tcg-mips-20150921' into... (diff) | |
| parent | qapi-introspect: Hide type names (diff) | |
| download | qemu-9e72681d16792d0ffc42bab634b1753ff299bdfd.tar.gz qemu-9e72681d16792d0ffc42bab634b1753ff299bdfd.tar.xz qemu-9e72681d16792d0ffc42bab634b1753ff299bdfd.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-09-21' into staging
qapi: QMP introspection
# gpg: Signature made Mon 21 Sep 2015 08:59:17 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-qapi-2015-09-21: (26 commits)
qapi-introspect: Hide type names
qapi: New QMP command query-qmp-schema for QMP introspection
qapi: Pseudo-type '**' is now unused, drop it
qapi-schema: Fix up misleading specification of netdev_add
qom: Don't use 'gen': false for qom-get, qom-set, object-add
qapi: Introduce a first class 'any' type
qapi: Make output visitor return qnull() instead of NULL
qapi: Improve built-in type documentation
qapi-commands: De-duplicate output marshaling functions
qapi: De-duplicate parameter list generation
qapi: Rename qmp_marshal_input_FOO() to qmp_marshal_FOO()
qapi-commands: Rearrange code
qapi-visit: Rearrange code a bit
qapi: Clean up after recent conversions to QAPISchemaVisitor
qapi: Replace dirty is_c_ptr() by method c_null()
qapi-event: Convert to QAPISchemaVisitor, fixing data with base
qapi-event: Eliminate global variable event_enum_value
qapi: De-duplicate enum code generation
qapi-commands: Convert to QAPISchemaVisitor
qapi-visit: Convert to QAPISchemaVisitor, fixing bugs
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qapi-schema/args-member-array.out')
| -rw-r--r-- | tests/qapi-schema/args-member-array.out | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/qapi-schema/args-member-array.out b/tests/qapi-schema/args-member-array.out index c39fa25484..b3b92dfc8e 100644 --- a/tests/qapi-schema/args-member-array.out +++ b/tests/qapi-schema/args-member-array.out @@ -1,5 +1,9 @@ -[OrderedDict([('enum', 'abc'), ('data', ['a', 'b', 'c'])]), - OrderedDict([('struct', 'def'), ('data', OrderedDict([('array', ['abc'])]))]), - OrderedDict([('command', 'okay'), ('data', OrderedDict([('member1', ['int']), ('member2', ['def'])]))])] -[{'enum_name': 'abc', 'enum_values': ['a', 'b', 'c']}] -[OrderedDict([('struct', 'def'), ('data', OrderedDict([('array', ['abc'])]))])] +object :empty +object :obj-okay-arg + member member1: intList optional=False + member member2: defList optional=False +enum abc ['a', 'b', 'c'] +object def + member array: abcList optional=False +command okay :obj-okay-arg -> None + gen=True success_response=True |
