These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / tests / qapi-schema / reserved-type-kind.json

diff --git a/qemu/tests/qapi-schema/enum-union-clash.json b/qemu/tests/qapi-schema/reserved-type-kind.json
similarity index 69%
rename from qemu/tests/qapi-schema/enum-union-clash.json
rename to qemu/tests/qapi-schema/reserved-type-kind.json
index 593282b..9ecaba1 100644 (file)
--- a/qemu/tests/qapi-schema/enum-union-clash.json
+++ b/qemu/tests/qapi-schema/reserved-type-kind.json
@@ -1,4 +1,2 @@
 # we reject types that would conflict with implicit union enum
 { 'enum': 'UnionKind', 'data': [ 'oops' ] }
-{ 'union': 'Union',
-  'data': { 'a': 'int' } }