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-bad-base.json
diff --git
a/qemu/tests/qapi-schema/flat-union-bad-base.json
b/qemu/tests/qapi-schema/flat-union-bad-base.json
index
e2e622b
..
74dd421
100644
(file)
--- a/
qemu/tests/qapi-schema/flat-union-bad-base.json
+++ b/
qemu/tests/qapi-schema/flat-union-bad-base.json
@@
-1,5
+1,4
@@
-# we require the base to be an existing struct
-# TODO: should we allow an anonymous inline base type?
+# we allow anonymous base, but enforce no duplicate keys
{ 'enum': 'TestEnum',
'data': [ 'value1', 'value2' ] }
{ 'struct': 'TestTypeA',
{ 'enum': 'TestEnum',
'data': [ 'value1', 'value2' ] }
{ 'struct': 'TestTypeA',
@@
-7,7
+6,7
@@
{ 'struct': 'TestTypeB',
'data': { 'integer': 'int' } }
{ 'union': 'TestUnion',
{ 'struct': 'TestTypeB',
'data': { 'integer': 'int' } }
{ 'union': 'TestUnion',
- 'base': { 'enum1': 'TestEnum', '
kind
': 'str' },
+ 'base': { 'enum1': 'TestEnum', '
string
': 'str' },
'discriminator': 'enum1',
'data': { 'value1': 'TestTypeA',
'value2': 'TestTypeB' } }
'discriminator': 'enum1',
'data': { 'value1': 'TestTypeA',
'value2': 'TestTypeB' } }