Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
tests
/
qapi-schema
/
flat-union-inline.json
diff --git
a/qemu/tests/qapi-schema/flat-union-inline.json
b/qemu/tests/qapi-schema/flat-union-inline.json
index
6bfdd65
..
62c7cda
100644
(file)
--- a/
qemu/tests/qapi-schema/flat-union-inline.json
+++ b/
qemu/tests/qapi-schema/flat-union-inline.json
@@
-1,11
+1,11
@@
# we require branches to be a struct name
# we require branches to be a struct name
-# TODO: should we allow anonymous inline types?
+# TODO: should we allow anonymous inline
branch
types?
{ 'enum': 'TestEnum',
'data': [ 'value1', 'value2' ] }
{ 'struct': 'Base',
'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
{ 'union': 'TestUnion',
{ 'enum': 'TestEnum',
'data': [ 'value1', 'value2' ] }
{ 'struct': 'Base',
'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
{ 'union': 'TestUnion',
- 'base':
{ 'enum1': 'TestEnum', 'kind': 'str' }
,
+ 'base':
'Base'
,
'discriminator': 'enum1',
'data': { 'value1': { 'string': 'str' },
'value2': { 'integer': 'int' } } }
'discriminator': 'enum1',
'data': { 'value1': { 'string': 'str' },
'value2': { 'integer': 'int' } } }