summaryrefslogtreecommitdiffstats
path: root/qemu/tests/qapi-schema
diff options
context:
space:
mode:
Diffstat (limited to 'qemu/tests/qapi-schema')
-rw-r--r--qemu/tests/qapi-schema/alternate-any.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-any.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-any.json4
-rw-r--r--qemu/tests/qapi-schema/alternate-any.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-array.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-array.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-array.json7
-rw-r--r--qemu/tests/qapi-schema/alternate-array.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-base.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-base.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-base.json6
-rw-r--r--qemu/tests/qapi-schema/alternate-base.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-clash.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-clash.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-clash.json8
-rw-r--r--qemu/tests/qapi-schema/alternate-clash.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-dict.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-dict.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-dict.json8
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-dict.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-string.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-string.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-string.json6
-rw-r--r--qemu/tests/qapi-schema/alternate-conflict-string.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-empty.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-empty.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-empty.json2
-rw-r--r--qemu/tests/qapi-schema/alternate-empty.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-nested.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-nested.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-nested.json5
-rw-r--r--qemu/tests/qapi-schema/alternate-nested.out0
-rw-r--r--qemu/tests/qapi-schema/alternate-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/alternate-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/alternate-unknown.json3
-rw-r--r--qemu/tests/qapi-schema/alternate-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/args-alternate.err1
-rw-r--r--qemu/tests/qapi-schema/args-alternate.exit1
-rw-r--r--qemu/tests/qapi-schema/args-alternate.json3
-rw-r--r--qemu/tests/qapi-schema/args-alternate.out0
-rw-r--r--qemu/tests/qapi-schema/args-any.err1
-rw-r--r--qemu/tests/qapi-schema/args-any.exit1
-rw-r--r--qemu/tests/qapi-schema/args-any.json2
-rw-r--r--qemu/tests/qapi-schema/args-any.out0
-rw-r--r--qemu/tests/qapi-schema/args-array-empty.err1
-rw-r--r--qemu/tests/qapi-schema/args-array-empty.exit1
-rw-r--r--qemu/tests/qapi-schema/args-array-empty.json2
-rw-r--r--qemu/tests/qapi-schema/args-array-empty.out0
-rw-r--r--qemu/tests/qapi-schema/args-array-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/args-array-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/args-array-unknown.json2
-rw-r--r--qemu/tests/qapi-schema/args-array-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/args-int.err1
-rw-r--r--qemu/tests/qapi-schema/args-int.exit1
-rw-r--r--qemu/tests/qapi-schema/args-int.json2
-rw-r--r--qemu/tests/qapi-schema/args-int.out0
-rw-r--r--qemu/tests/qapi-schema/args-invalid.err1
-rw-r--r--qemu/tests/qapi-schema/args-invalid.exit1
-rw-r--r--qemu/tests/qapi-schema/args-invalid.json2
-rw-r--r--qemu/tests/qapi-schema/args-invalid.out0
-rw-r--r--qemu/tests/qapi-schema/args-member-array-bad.err1
-rw-r--r--qemu/tests/qapi-schema/args-member-array-bad.exit1
-rw-r--r--qemu/tests/qapi-schema/args-member-array-bad.json2
-rw-r--r--qemu/tests/qapi-schema/args-member-array-bad.out0
-rw-r--r--qemu/tests/qapi-schema/args-member-case.err1
-rw-r--r--qemu/tests/qapi-schema/args-member-case.exit1
-rw-r--r--qemu/tests/qapi-schema/args-member-case.json2
-rw-r--r--qemu/tests/qapi-schema/args-member-case.out0
-rw-r--r--qemu/tests/qapi-schema/args-member-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/args-member-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/args-member-unknown.json2
-rw-r--r--qemu/tests/qapi-schema/args-member-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/args-name-clash.err1
-rw-r--r--qemu/tests/qapi-schema/args-name-clash.exit1
-rw-r--r--qemu/tests/qapi-schema/args-name-clash.json4
-rw-r--r--qemu/tests/qapi-schema/args-name-clash.out0
-rw-r--r--qemu/tests/qapi-schema/args-union.err1
-rw-r--r--qemu/tests/qapi-schema/args-union.exit1
-rw-r--r--qemu/tests/qapi-schema/args-union.json4
-rw-r--r--qemu/tests/qapi-schema/args-union.out0
-rw-r--r--qemu/tests/qapi-schema/args-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/args-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/args-unknown.json2
-rw-r--r--qemu/tests/qapi-schema/args-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/bad-base.err1
-rw-r--r--qemu/tests/qapi-schema/bad-base.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-base.json3
-rw-r--r--qemu/tests/qapi-schema/bad-base.out0
-rw-r--r--qemu/tests/qapi-schema/bad-data.err1
-rw-r--r--qemu/tests/qapi-schema/bad-data.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-data.json2
-rw-r--r--qemu/tests/qapi-schema/bad-data.out0
-rw-r--r--qemu/tests/qapi-schema/bad-ident.err1
-rw-r--r--qemu/tests/qapi-schema/bad-ident.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-ident.json2
-rw-r--r--qemu/tests/qapi-schema/bad-ident.out0
-rw-r--r--qemu/tests/qapi-schema/bad-type-bool.err1
-rw-r--r--qemu/tests/qapi-schema/bad-type-bool.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-type-bool.json2
-rw-r--r--qemu/tests/qapi-schema/bad-type-bool.out0
-rw-r--r--qemu/tests/qapi-schema/bad-type-dict.err1
-rw-r--r--qemu/tests/qapi-schema/bad-type-dict.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-type-dict.json2
-rw-r--r--qemu/tests/qapi-schema/bad-type-dict.out0
-rw-r--r--qemu/tests/qapi-schema/bad-type-int.err1
-rw-r--r--qemu/tests/qapi-schema/bad-type-int.exit1
-rw-r--r--qemu/tests/qapi-schema/bad-type-int.json3
-rw-r--r--qemu/tests/qapi-schema/bad-type-int.out0
-rw-r--r--qemu/tests/qapi-schema/base-cycle-direct.err1
-rw-r--r--qemu/tests/qapi-schema/base-cycle-direct.exit1
-rw-r--r--qemu/tests/qapi-schema/base-cycle-direct.json2
-rw-r--r--qemu/tests/qapi-schema/base-cycle-direct.out0
-rw-r--r--qemu/tests/qapi-schema/base-cycle-indirect.err1
-rw-r--r--qemu/tests/qapi-schema/base-cycle-indirect.exit1
-rw-r--r--qemu/tests/qapi-schema/base-cycle-indirect.json3
-rw-r--r--qemu/tests/qapi-schema/base-cycle-indirect.out0
-rw-r--r--qemu/tests/qapi-schema/command-int.err1
-rw-r--r--qemu/tests/qapi-schema/command-int.exit1
-rw-r--r--qemu/tests/qapi-schema/command-int.json2
-rw-r--r--qemu/tests/qapi-schema/command-int.out0
-rw-r--r--qemu/tests/qapi-schema/comments.err0
-rw-r--r--qemu/tests/qapi-schema/comments.exit1
-rw-r--r--qemu/tests/qapi-schema/comments.json4
-rw-r--r--qemu/tests/qapi-schema/comments.out4
-rw-r--r--qemu/tests/qapi-schema/double-data.err1
-rw-r--r--qemu/tests/qapi-schema/double-data.exit1
-rw-r--r--qemu/tests/qapi-schema/double-data.json2
-rw-r--r--qemu/tests/qapi-schema/double-data.out0
-rw-r--r--qemu/tests/qapi-schema/double-type.err1
-rw-r--r--qemu/tests/qapi-schema/double-type.exit1
-rw-r--r--qemu/tests/qapi-schema/double-type.json2
-rw-r--r--qemu/tests/qapi-schema/double-type.out0
-rw-r--r--qemu/tests/qapi-schema/duplicate-key.err1
-rw-r--r--qemu/tests/qapi-schema/duplicate-key.exit1
-rw-r--r--qemu/tests/qapi-schema/duplicate-key.json3
-rw-r--r--qemu/tests/qapi-schema/duplicate-key.out0
-rw-r--r--qemu/tests/qapi-schema/empty.err0
-rw-r--r--qemu/tests/qapi-schema/empty.exit1
-rw-r--r--qemu/tests/qapi-schema/empty.json0
-rw-r--r--qemu/tests/qapi-schema/empty.out3
-rw-r--r--qemu/tests/qapi-schema/enum-bad-name.err1
-rw-r--r--qemu/tests/qapi-schema/enum-bad-name.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-bad-name.json2
-rw-r--r--qemu/tests/qapi-schema/enum-bad-name.out0
-rw-r--r--qemu/tests/qapi-schema/enum-bad-prefix.err1
-rw-r--r--qemu/tests/qapi-schema/enum-bad-prefix.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-bad-prefix.json2
-rw-r--r--qemu/tests/qapi-schema/enum-bad-prefix.out0
-rw-r--r--qemu/tests/qapi-schema/enum-clash-member.err1
-rw-r--r--qemu/tests/qapi-schema/enum-clash-member.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-clash-member.json2
-rw-r--r--qemu/tests/qapi-schema/enum-clash-member.out0
-rw-r--r--qemu/tests/qapi-schema/enum-dict-member.err1
-rw-r--r--qemu/tests/qapi-schema/enum-dict-member.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-dict-member.json2
-rw-r--r--qemu/tests/qapi-schema/enum-dict-member.out0
-rw-r--r--qemu/tests/qapi-schema/enum-int-member.err1
-rw-r--r--qemu/tests/qapi-schema/enum-int-member.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-int-member.json3
-rw-r--r--qemu/tests/qapi-schema/enum-int-member.out0
-rw-r--r--qemu/tests/qapi-schema/enum-member-case.err1
-rw-r--r--qemu/tests/qapi-schema/enum-member-case.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-member-case.json3
-rw-r--r--qemu/tests/qapi-schema/enum-member-case.out0
-rw-r--r--qemu/tests/qapi-schema/enum-missing-data.err1
-rw-r--r--qemu/tests/qapi-schema/enum-missing-data.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-missing-data.json2
-rw-r--r--qemu/tests/qapi-schema/enum-missing-data.out0
-rw-r--r--qemu/tests/qapi-schema/enum-wrong-data.err1
-rw-r--r--qemu/tests/qapi-schema/enum-wrong-data.exit1
-rw-r--r--qemu/tests/qapi-schema/enum-wrong-data.json2
-rw-r--r--qemu/tests/qapi-schema/enum-wrong-data.out0
-rw-r--r--qemu/tests/qapi-schema/escape-outside-string.err1
-rw-r--r--qemu/tests/qapi-schema/escape-outside-string.exit1
-rw-r--r--qemu/tests/qapi-schema/escape-outside-string.json3
-rw-r--r--qemu/tests/qapi-schema/escape-outside-string.out0
-rw-r--r--qemu/tests/qapi-schema/escape-too-big.err1
-rw-r--r--qemu/tests/qapi-schema/escape-too-big.exit1
-rw-r--r--qemu/tests/qapi-schema/escape-too-big.json3
-rw-r--r--qemu/tests/qapi-schema/escape-too-big.out0
-rw-r--r--qemu/tests/qapi-schema/escape-too-short.err1
-rw-r--r--qemu/tests/qapi-schema/escape-too-short.exit1
-rw-r--r--qemu/tests/qapi-schema/escape-too-short.json3
-rw-r--r--qemu/tests/qapi-schema/escape-too-short.out0
-rw-r--r--qemu/tests/qapi-schema/event-case.err0
-rw-r--r--qemu/tests/qapi-schema/event-case.exit1
-rw-r--r--qemu/tests/qapi-schema/event-case.json3
-rw-r--r--qemu/tests/qapi-schema/event-case.out4
-rw-r--r--qemu/tests/qapi-schema/event-nest-struct.err1
-rw-r--r--qemu/tests/qapi-schema/event-nest-struct.exit1
-rw-r--r--qemu/tests/qapi-schema/event-nest-struct.json2
-rw-r--r--qemu/tests/qapi-schema/event-nest-struct.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-array-branch.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-array-branch.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-array-branch.json12
-rw-r--r--qemu/tests/qapi-schema/flat-union-array-branch.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-base.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-base.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-base.json12
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-base.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-discriminator.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-discriminator.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-discriminator.json15
-rw-r--r--qemu/tests/qapi-schema/flat-union-bad-discriminator.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-any.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-any.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-any.json12
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-any.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-union.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-union.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-union.json18
-rw-r--r--qemu/tests/qapi-schema/flat-union-base-union.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-clash-member.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-clash-member.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-clash-member.json15
-rw-r--r--qemu/tests/qapi-schema/flat-union-clash-member.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-empty.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-empty.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-empty.json4
-rw-r--r--qemu/tests/qapi-schema/flat-union-empty.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-inline.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-inline.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-inline.json11
-rw-r--r--qemu/tests/qapi-schema/flat-union-inline.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-int-branch.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-int-branch.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-int-branch.json12
-rw-r--r--qemu/tests/qapi-schema/flat-union-int-branch.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-branch-key.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-branch-key.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-branch-key.json17
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-branch-key.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-discriminator.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-discriminator.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-discriminator.json17
-rw-r--r--qemu/tests/qapi-schema/flat-union-invalid-discriminator.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-no-base.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-no-base.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-no-base.json12
-rw-r--r--qemu/tests/qapi-schema/flat-union-no-base.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-optional-discriminator.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-optional-discriminator.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-optional-discriminator.json10
-rw-r--r--qemu/tests/qapi-schema/flat-union-optional-discriminator.out0
-rw-r--r--qemu/tests/qapi-schema/flat-union-string-discriminator.err1
-rw-r--r--qemu/tests/qapi-schema/flat-union-string-discriminator.exit1
-rw-r--r--qemu/tests/qapi-schema/flat-union-string-discriminator.json17
-rw-r--r--qemu/tests/qapi-schema/flat-union-string-discriminator.out0
-rw-r--r--qemu/tests/qapi-schema/funny-char.err1
-rw-r--r--qemu/tests/qapi-schema/funny-char.exit1
-rw-r--r--qemu/tests/qapi-schema/funny-char.json2
-rw-r--r--qemu/tests/qapi-schema/funny-char.out0
-rw-r--r--qemu/tests/qapi-schema/ident-with-escape.err0
-rw-r--r--qemu/tests/qapi-schema/ident-with-escape.exit1
-rw-r--r--qemu/tests/qapi-schema/ident-with-escape.json4
-rw-r--r--qemu/tests/qapi-schema/ident-with-escape.out7
-rw-r--r--qemu/tests/qapi-schema/include-before-err.err1
-rw-r--r--qemu/tests/qapi-schema/include-before-err.exit1
-rw-r--r--qemu/tests/qapi-schema/include-before-err.json2
-rw-r--r--qemu/tests/qapi-schema/include-before-err.out0
-rw-r--r--qemu/tests/qapi-schema/include-cycle-b.json1
-rw-r--r--qemu/tests/qapi-schema/include-cycle-c.json1
-rw-r--r--qemu/tests/qapi-schema/include-cycle.err3
-rw-r--r--qemu/tests/qapi-schema/include-cycle.exit1
-rw-r--r--qemu/tests/qapi-schema/include-cycle.json1
-rw-r--r--qemu/tests/qapi-schema/include-cycle.out0
-rw-r--r--qemu/tests/qapi-schema/include-format-err.err1
-rw-r--r--qemu/tests/qapi-schema/include-format-err.exit1
-rw-r--r--qemu/tests/qapi-schema/include-format-err.json2
-rw-r--r--qemu/tests/qapi-schema/include-format-err.out0
-rw-r--r--qemu/tests/qapi-schema/include-nested-err.err2
-rw-r--r--qemu/tests/qapi-schema/include-nested-err.exit1
-rw-r--r--qemu/tests/qapi-schema/include-nested-err.json1
-rw-r--r--qemu/tests/qapi-schema/include-nested-err.out0
-rw-r--r--qemu/tests/qapi-schema/include-no-file.err1
-rw-r--r--qemu/tests/qapi-schema/include-no-file.exit1
-rw-r--r--qemu/tests/qapi-schema/include-no-file.json1
-rw-r--r--qemu/tests/qapi-schema/include-no-file.out0
-rw-r--r--qemu/tests/qapi-schema/include-non-file.err1
-rw-r--r--qemu/tests/qapi-schema/include-non-file.exit1
-rw-r--r--qemu/tests/qapi-schema/include-non-file.json1
-rw-r--r--qemu/tests/qapi-schema/include-non-file.out0
-rw-r--r--qemu/tests/qapi-schema/include-relpath-sub.json2
-rw-r--r--qemu/tests/qapi-schema/include-relpath.err0
-rw-r--r--qemu/tests/qapi-schema/include-relpath.exit1
-rw-r--r--qemu/tests/qapi-schema/include-relpath.json1
-rw-r--r--qemu/tests/qapi-schema/include-relpath.out4
-rw-r--r--qemu/tests/qapi-schema/include-repetition-sub.json2
-rw-r--r--qemu/tests/qapi-schema/include-repetition.err0
-rw-r--r--qemu/tests/qapi-schema/include-repetition.exit1
-rw-r--r--qemu/tests/qapi-schema/include-repetition.json3
-rw-r--r--qemu/tests/qapi-schema/include-repetition.out4
-rw-r--r--qemu/tests/qapi-schema/include-self-cycle.err1
-rw-r--r--qemu/tests/qapi-schema/include-self-cycle.exit1
-rw-r--r--qemu/tests/qapi-schema/include-self-cycle.json1
-rw-r--r--qemu/tests/qapi-schema/include-self-cycle.out0
-rw-r--r--qemu/tests/qapi-schema/include-simple-sub.json2
-rw-r--r--qemu/tests/qapi-schema/include-simple.err0
-rw-r--r--qemu/tests/qapi-schema/include-simple.exit1
-rw-r--r--qemu/tests/qapi-schema/include-simple.json1
-rw-r--r--qemu/tests/qapi-schema/include-simple.out4
-rw-r--r--qemu/tests/qapi-schema/include/relpath.json1
-rw-r--r--qemu/tests/qapi-schema/indented-expr.err0
-rw-r--r--qemu/tests/qapi-schema/indented-expr.exit1
-rw-r--r--qemu/tests/qapi-schema/indented-expr.json2
-rw-r--r--qemu/tests/qapi-schema/indented-expr.out7
-rw-r--r--qemu/tests/qapi-schema/leading-comma-list.err1
-rw-r--r--qemu/tests/qapi-schema/leading-comma-list.exit1
-rw-r--r--qemu/tests/qapi-schema/leading-comma-list.json2
-rw-r--r--qemu/tests/qapi-schema/leading-comma-list.out0
-rw-r--r--qemu/tests/qapi-schema/leading-comma-object.err1
-rw-r--r--qemu/tests/qapi-schema/leading-comma-object.exit1
-rw-r--r--qemu/tests/qapi-schema/leading-comma-object.json2
-rw-r--r--qemu/tests/qapi-schema/leading-comma-object.out0
-rw-r--r--qemu/tests/qapi-schema/missing-colon.err1
-rw-r--r--qemu/tests/qapi-schema/missing-colon.exit1
-rw-r--r--qemu/tests/qapi-schema/missing-colon.json2
-rw-r--r--qemu/tests/qapi-schema/missing-colon.out0
-rw-r--r--qemu/tests/qapi-schema/missing-comma-list.err1
-rw-r--r--qemu/tests/qapi-schema/missing-comma-list.exit1
-rw-r--r--qemu/tests/qapi-schema/missing-comma-list.json2
-rw-r--r--qemu/tests/qapi-schema/missing-comma-list.out0
-rw-r--r--qemu/tests/qapi-schema/missing-comma-object.err1
-rw-r--r--qemu/tests/qapi-schema/missing-comma-object.exit1
-rw-r--r--qemu/tests/qapi-schema/missing-comma-object.json2
-rw-r--r--qemu/tests/qapi-schema/missing-comma-object.out0
-rw-r--r--qemu/tests/qapi-schema/missing-type.err1
-rw-r--r--qemu/tests/qapi-schema/missing-type.exit1
-rw-r--r--qemu/tests/qapi-schema/missing-type.json2
-rw-r--r--qemu/tests/qapi-schema/missing-type.out0
-rw-r--r--qemu/tests/qapi-schema/nested-struct-data.err1
-rw-r--r--qemu/tests/qapi-schema/nested-struct-data.exit1
-rw-r--r--qemu/tests/qapi-schema/nested-struct-data.json3
-rw-r--r--qemu/tests/qapi-schema/nested-struct-data.out0
-rw-r--r--qemu/tests/qapi-schema/non-objects.err1
-rw-r--r--qemu/tests/qapi-schema/non-objects.exit1
-rw-r--r--qemu/tests/qapi-schema/non-objects.json2
-rw-r--r--qemu/tests/qapi-schema/non-objects.out0
-rw-r--r--qemu/tests/qapi-schema/qapi-schema-test.err0
-rw-r--r--qemu/tests/qapi-schema/qapi-schema-test.exit1
-rw-r--r--qemu/tests/qapi-schema/qapi-schema-test.json177
-rw-r--r--qemu/tests/qapi-schema/qapi-schema-test.out211
-rw-r--r--qemu/tests/qapi-schema/quoted-structural-chars.err1
-rw-r--r--qemu/tests/qapi-schema/quoted-structural-chars.exit1
-rw-r--r--qemu/tests/qapi-schema/quoted-structural-chars.json1
-rw-r--r--qemu/tests/qapi-schema/quoted-structural-chars.out0
-rw-r--r--qemu/tests/qapi-schema/redefined-builtin.err1
-rw-r--r--qemu/tests/qapi-schema/redefined-builtin.exit1
-rw-r--r--qemu/tests/qapi-schema/redefined-builtin.json2
-rw-r--r--qemu/tests/qapi-schema/redefined-builtin.out0
-rw-r--r--qemu/tests/qapi-schema/redefined-command.err1
-rw-r--r--qemu/tests/qapi-schema/redefined-command.exit1
-rw-r--r--qemu/tests/qapi-schema/redefined-command.json3
-rw-r--r--qemu/tests/qapi-schema/redefined-command.out0
-rw-r--r--qemu/tests/qapi-schema/redefined-event.err1
-rw-r--r--qemu/tests/qapi-schema/redefined-event.exit1
-rw-r--r--qemu/tests/qapi-schema/redefined-event.json3
-rw-r--r--qemu/tests/qapi-schema/redefined-event.out0
-rw-r--r--qemu/tests/qapi-schema/redefined-type.err1
-rw-r--r--qemu/tests/qapi-schema/redefined-type.exit1
-rw-r--r--qemu/tests/qapi-schema/redefined-type.json3
-rw-r--r--qemu/tests/qapi-schema/redefined-type.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-command-q.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-command-q.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-command-q.json5
-rw-r--r--qemu/tests/qapi-schema/reserved-command-q.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-enum-q.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-enum-q.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-enum-q.json4
-rw-r--r--qemu/tests/qapi-schema/reserved-enum-q.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-member-has.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-has.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-has.json5
-rw-r--r--qemu/tests/qapi-schema/reserved-member-has.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-member-q.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-q.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-q.json4
-rw-r--r--qemu/tests/qapi-schema/reserved-member-q.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-member-u.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-u.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-u.json7
-rw-r--r--qemu/tests/qapi-schema/reserved-member-u.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-member-underscore.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-underscore.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-member-underscore.json4
-rw-r--r--qemu/tests/qapi-schema/reserved-member-underscore.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-type-kind.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-type-kind.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-type-kind.json2
-rw-r--r--qemu/tests/qapi-schema/reserved-type-kind.out0
-rw-r--r--qemu/tests/qapi-schema/reserved-type-list.err1
-rw-r--r--qemu/tests/qapi-schema/reserved-type-list.exit1
-rw-r--r--qemu/tests/qapi-schema/reserved-type-list.json5
-rw-r--r--qemu/tests/qapi-schema/reserved-type-list.out0
-rw-r--r--qemu/tests/qapi-schema/returns-alternate.err1
-rw-r--r--qemu/tests/qapi-schema/returns-alternate.exit1
-rw-r--r--qemu/tests/qapi-schema/returns-alternate.json3
-rw-r--r--qemu/tests/qapi-schema/returns-alternate.out0
-rw-r--r--qemu/tests/qapi-schema/returns-array-bad.err1
-rw-r--r--qemu/tests/qapi-schema/returns-array-bad.exit1
-rw-r--r--qemu/tests/qapi-schema/returns-array-bad.json2
-rw-r--r--qemu/tests/qapi-schema/returns-array-bad.out0
-rw-r--r--qemu/tests/qapi-schema/returns-dict.err1
-rw-r--r--qemu/tests/qapi-schema/returns-dict.exit1
-rw-r--r--qemu/tests/qapi-schema/returns-dict.json2
-rw-r--r--qemu/tests/qapi-schema/returns-dict.out0
-rw-r--r--qemu/tests/qapi-schema/returns-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/returns-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/returns-unknown.json2
-rw-r--r--qemu/tests/qapi-schema/returns-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/returns-whitelist.err1
-rw-r--r--qemu/tests/qapi-schema/returns-whitelist.exit1
-rw-r--r--qemu/tests/qapi-schema/returns-whitelist.json11
-rw-r--r--qemu/tests/qapi-schema/returns-whitelist.out0
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash-deep.err1
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash-deep.exit1
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash-deep.json12
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash-deep.out0
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash.err1
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash.exit1
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash.json7
-rw-r--r--qemu/tests/qapi-schema/struct-base-clash.out0
-rw-r--r--qemu/tests/qapi-schema/struct-data-invalid.err1
-rw-r--r--qemu/tests/qapi-schema/struct-data-invalid.exit1
-rw-r--r--qemu/tests/qapi-schema/struct-data-invalid.json2
-rw-r--r--qemu/tests/qapi-schema/struct-data-invalid.out0
-rw-r--r--qemu/tests/qapi-schema/struct-member-invalid.err1
-rw-r--r--qemu/tests/qapi-schema/struct-member-invalid.exit1
-rw-r--r--qemu/tests/qapi-schema/struct-member-invalid.json2
-rw-r--r--qemu/tests/qapi-schema/struct-member-invalid.out0
-rw-r--r--qemu/tests/qapi-schema/test-qapi.py56
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-list.err1
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-list.exit1
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-list.json2
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-list.out0
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-object.err1
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-object.exit1
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-object.json2
-rw-r--r--qemu/tests/qapi-schema/trailing-comma-object.out0
-rw-r--r--qemu/tests/qapi-schema/type-bypass-bad-gen.err1
-rw-r--r--qemu/tests/qapi-schema/type-bypass-bad-gen.exit1
-rw-r--r--qemu/tests/qapi-schema/type-bypass-bad-gen.json2
-rw-r--r--qemu/tests/qapi-schema/type-bypass-bad-gen.out0
-rw-r--r--qemu/tests/qapi-schema/unclosed-list.err1
-rw-r--r--qemu/tests/qapi-schema/unclosed-list.exit1
-rw-r--r--qemu/tests/qapi-schema/unclosed-list.json1
-rw-r--r--qemu/tests/qapi-schema/unclosed-list.out0
-rw-r--r--qemu/tests/qapi-schema/unclosed-object.err1
-rw-r--r--qemu/tests/qapi-schema/unclosed-object.exit1
-rw-r--r--qemu/tests/qapi-schema/unclosed-object.json1
-rw-r--r--qemu/tests/qapi-schema/unclosed-object.out0
-rw-r--r--qemu/tests/qapi-schema/unclosed-string.err1
-rw-r--r--qemu/tests/qapi-schema/unclosed-string.exit1
-rw-r--r--qemu/tests/qapi-schema/unclosed-string.json2
-rw-r--r--qemu/tests/qapi-schema/unclosed-string.out0
-rw-r--r--qemu/tests/qapi-schema/unicode-str.err1
-rw-r--r--qemu/tests/qapi-schema/unicode-str.exit1
-rw-r--r--qemu/tests/qapi-schema/unicode-str.json2
-rw-r--r--qemu/tests/qapi-schema/unicode-str.out0
-rw-r--r--qemu/tests/qapi-schema/union-base-no-discriminator.err1
-rw-r--r--qemu/tests/qapi-schema/union-base-no-discriminator.exit1
-rw-r--r--qemu/tests/qapi-schema/union-base-no-discriminator.json14
-rw-r--r--qemu/tests/qapi-schema/union-base-no-discriminator.out0
-rw-r--r--qemu/tests/qapi-schema/union-branch-case.err1
-rw-r--r--qemu/tests/qapi-schema/union-branch-case.exit1
-rw-r--r--qemu/tests/qapi-schema/union-branch-case.json2
-rw-r--r--qemu/tests/qapi-schema/union-branch-case.out0
-rw-r--r--qemu/tests/qapi-schema/union-clash-branches.err1
-rw-r--r--qemu/tests/qapi-schema/union-clash-branches.exit1
-rw-r--r--qemu/tests/qapi-schema/union-clash-branches.json5
-rw-r--r--qemu/tests/qapi-schema/union-clash-branches.out0
-rw-r--r--qemu/tests/qapi-schema/union-empty.err1
-rw-r--r--qemu/tests/qapi-schema/union-empty.exit1
-rw-r--r--qemu/tests/qapi-schema/union-empty.json2
-rw-r--r--qemu/tests/qapi-schema/union-empty.out0
-rw-r--r--qemu/tests/qapi-schema/union-invalid-base.err1
-rw-r--r--qemu/tests/qapi-schema/union-invalid-base.exit1
-rw-r--r--qemu/tests/qapi-schema/union-invalid-base.json12
-rw-r--r--qemu/tests/qapi-schema/union-invalid-base.out0
-rw-r--r--qemu/tests/qapi-schema/union-optional-branch.err1
-rw-r--r--qemu/tests/qapi-schema/union-optional-branch.exit1
-rw-r--r--qemu/tests/qapi-schema/union-optional-branch.json2
-rw-r--r--qemu/tests/qapi-schema/union-optional-branch.out0
-rw-r--r--qemu/tests/qapi-schema/union-unknown.err1
-rw-r--r--qemu/tests/qapi-schema/union-unknown.exit1
-rw-r--r--qemu/tests/qapi-schema/union-unknown.json3
-rw-r--r--qemu/tests/qapi-schema/union-unknown.out0
-rw-r--r--qemu/tests/qapi-schema/unknown-escape.err1
-rw-r--r--qemu/tests/qapi-schema/unknown-escape.exit1
-rw-r--r--qemu/tests/qapi-schema/unknown-escape.json3
-rw-r--r--qemu/tests/qapi-schema/unknown-escape.out0
-rw-r--r--qemu/tests/qapi-schema/unknown-expr-key.err1
-rw-r--r--qemu/tests/qapi-schema/unknown-expr-key.exit1
-rw-r--r--qemu/tests/qapi-schema/unknown-expr-key.json2
-rw-r--r--qemu/tests/qapi-schema/unknown-expr-key.out0
495 files changed, 0 insertions, 1241 deletions
diff --git a/qemu/tests/qapi-schema/alternate-any.err b/qemu/tests/qapi-schema/alternate-any.err
deleted file mode 100644
index aaa015473..000000000
--- a/qemu/tests/qapi-schema/alternate-any.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-any.json:2: Alternate 'Alt' member 'one' cannot use type 'any'
diff --git a/qemu/tests/qapi-schema/alternate-any.exit b/qemu/tests/qapi-schema/alternate-any.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-any.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-any.json b/qemu/tests/qapi-schema/alternate-any.json
deleted file mode 100644
index e47a73a11..000000000
--- a/qemu/tests/qapi-schema/alternate-any.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# we do not allow the 'any' type as an alternate branch
-{ 'alternate': 'Alt',
- 'data': { 'one': 'any',
- 'two': 'int' } }
diff --git a/qemu/tests/qapi-schema/alternate-any.out b/qemu/tests/qapi-schema/alternate-any.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-any.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-array.err b/qemu/tests/qapi-schema/alternate-array.err
deleted file mode 100644
index 7b930c64a..000000000
--- a/qemu/tests/qapi-schema/alternate-array.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-array.json:5: Member 'two' of alternate 'Alt' cannot be an array
diff --git a/qemu/tests/qapi-schema/alternate-array.exit b/qemu/tests/qapi-schema/alternate-array.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-array.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-array.json b/qemu/tests/qapi-schema/alternate-array.json
deleted file mode 100644
index f241aac12..000000000
--- a/qemu/tests/qapi-schema/alternate-array.json
+++ /dev/null
@@ -1,7 +0,0 @@
-# we do not allow array branches in alternates
-# TODO: should we support this?
-{ 'struct': 'One',
- 'data': { 'name': 'str' } }
-{ 'alternate': 'Alt',
- 'data': { 'one': 'One',
- 'two': [ 'int' ] } }
diff --git a/qemu/tests/qapi-schema/alternate-array.out b/qemu/tests/qapi-schema/alternate-array.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-array.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-base.err b/qemu/tests/qapi-schema/alternate-base.err
deleted file mode 100644
index 30d8a3437..000000000
--- a/qemu/tests/qapi-schema/alternate-base.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-base.json:4: Unknown key 'base' in alternate 'Alt'
diff --git a/qemu/tests/qapi-schema/alternate-base.exit b/qemu/tests/qapi-schema/alternate-base.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-base.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-base.json b/qemu/tests/qapi-schema/alternate-base.json
deleted file mode 100644
index 529430ecf..000000000
--- a/qemu/tests/qapi-schema/alternate-base.json
+++ /dev/null
@@ -1,6 +0,0 @@
-# we reject alternate with base type
-{ 'struct': 'Base',
- 'data': { 'string': 'str' } }
-{ 'alternate': 'Alt',
- 'base': 'Base',
- 'data': { 'number': 'int' } }
diff --git a/qemu/tests/qapi-schema/alternate-base.out b/qemu/tests/qapi-schema/alternate-base.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-base.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-clash.err b/qemu/tests/qapi-schema/alternate-clash.err
deleted file mode 100644
index 604d8495e..000000000
--- a/qemu/tests/qapi-schema/alternate-clash.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-clash.json:7: 'a_b' (branch of Alt1) collides with 'a-b' (branch of Alt1)
diff --git a/qemu/tests/qapi-schema/alternate-clash.exit b/qemu/tests/qapi-schema/alternate-clash.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-clash.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-clash.json b/qemu/tests/qapi-schema/alternate-clash.json
deleted file mode 100644
index 6d73bc527..000000000
--- a/qemu/tests/qapi-schema/alternate-clash.json
+++ /dev/null
@@ -1,8 +0,0 @@
-# Alternate branch name collision
-# Reject an alternate that would result in a collision in generated C
-# names (this would try to generate two enum values 'ALT1_KIND_A_B').
-# TODO: In the future, if alternates are simplified to not generate
-# the implicit Alt1Kind enum, we would still have a collision with the
-# resulting C union trying to have two members named 'a_b'.
-{ 'alternate': 'Alt1',
- 'data': { 'a-b': 'str', 'a_b': 'int' } }
diff --git a/qemu/tests/qapi-schema/alternate-clash.out b/qemu/tests/qapi-schema/alternate-clash.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-clash.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-conflict-dict.err b/qemu/tests/qapi-schema/alternate-conflict-dict.err
deleted file mode 100644
index 0f411f4fa..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-dict.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-conflict-dict.json:6: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
diff --git a/qemu/tests/qapi-schema/alternate-conflict-dict.exit b/qemu/tests/qapi-schema/alternate-conflict-dict.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-dict.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-conflict-dict.json b/qemu/tests/qapi-schema/alternate-conflict-dict.json
deleted file mode 100644
index d566cca81..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-dict.json
+++ /dev/null
@@ -1,8 +0,0 @@
-# we reject alternates with multiple object branches
-{ 'struct': 'One',
- 'data': { 'name': 'str' } }
-{ 'struct': 'Two',
- 'data': { 'value': 'int' } }
-{ 'alternate': 'Alt',
- 'data': { 'one': 'One',
- 'two': 'Two' } }
diff --git a/qemu/tests/qapi-schema/alternate-conflict-dict.out b/qemu/tests/qapi-schema/alternate-conflict-dict.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-dict.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-conflict-string.err b/qemu/tests/qapi-schema/alternate-conflict-string.err
deleted file mode 100644
index fc523b087..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-string.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-conflict-string.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one'
diff --git a/qemu/tests/qapi-schema/alternate-conflict-string.exit b/qemu/tests/qapi-schema/alternate-conflict-string.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-string.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-conflict-string.json b/qemu/tests/qapi-schema/alternate-conflict-string.json
deleted file mode 100644
index 72f04a820..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-string.json
+++ /dev/null
@@ -1,6 +0,0 @@
-# we reject alternates with multiple string-like branches
-{ 'enum': 'Enum',
- 'data': [ 'hello', 'world' ] }
-{ 'alternate': 'Alt',
- 'data': { 'one': 'str',
- 'two': 'Enum' } }
diff --git a/qemu/tests/qapi-schema/alternate-conflict-string.out b/qemu/tests/qapi-schema/alternate-conflict-string.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-conflict-string.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-empty.err b/qemu/tests/qapi-schema/alternate-empty.err
deleted file mode 100644
index bb06c5bfe..000000000
--- a/qemu/tests/qapi-schema/alternate-empty.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-empty.json:2: Alternate 'Alt' should have at least two branches in 'data'
diff --git a/qemu/tests/qapi-schema/alternate-empty.exit b/qemu/tests/qapi-schema/alternate-empty.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-empty.json b/qemu/tests/qapi-schema/alternate-empty.json
deleted file mode 100644
index fff15baf1..000000000
--- a/qemu/tests/qapi-schema/alternate-empty.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# alternates must list at least two types to be useful
-{ 'alternate': 'Alt', 'data': { 'i': 'int' } }
diff --git a/qemu/tests/qapi-schema/alternate-empty.out b/qemu/tests/qapi-schema/alternate-empty.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-empty.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-nested.err b/qemu/tests/qapi-schema/alternate-nested.err
deleted file mode 100644
index 4d1187e60..000000000
--- a/qemu/tests/qapi-schema/alternate-nested.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-nested.json:4: Member 'nested' of alternate 'Alt2' cannot use alternate type 'Alt1'
diff --git a/qemu/tests/qapi-schema/alternate-nested.exit b/qemu/tests/qapi-schema/alternate-nested.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-nested.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-nested.json b/qemu/tests/qapi-schema/alternate-nested.json
deleted file mode 100644
index 8e2218649..000000000
--- a/qemu/tests/qapi-schema/alternate-nested.json
+++ /dev/null
@@ -1,5 +0,0 @@
-# we reject a nested alternate branch
-{ 'alternate': 'Alt1',
- 'data': { 'name': 'str', 'value': 'int' } }
-{ 'alternate': 'Alt2',
- 'data': { 'nested': 'Alt1', 'b': 'bool' } }
diff --git a/qemu/tests/qapi-schema/alternate-nested.out b/qemu/tests/qapi-schema/alternate-nested.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-nested.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/alternate-unknown.err b/qemu/tests/qapi-schema/alternate-unknown.err
deleted file mode 100644
index dea45dc73..000000000
--- a/qemu/tests/qapi-schema/alternate-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/alternate-unknown.json:2: Member 'unknown' of alternate 'Alt' uses unknown type 'MissingType'
diff --git a/qemu/tests/qapi-schema/alternate-unknown.exit b/qemu/tests/qapi-schema/alternate-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/alternate-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/alternate-unknown.json b/qemu/tests/qapi-schema/alternate-unknown.json
deleted file mode 100644
index 08c80dced..000000000
--- a/qemu/tests/qapi-schema/alternate-unknown.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject an alternate with unknown type in branch
-{ 'alternate': 'Alt',
- 'data': { 'unknown': 'MissingType', 'i': 'int' } }
diff --git a/qemu/tests/qapi-schema/alternate-unknown.out b/qemu/tests/qapi-schema/alternate-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/alternate-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-alternate.err b/qemu/tests/qapi-schema/args-alternate.err
deleted file mode 100644
index 3086eae56..000000000
--- a/qemu/tests/qapi-schema/args-alternate.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-alternate.json:3: 'data' for command 'oops' cannot use alternate type 'Alt'
diff --git a/qemu/tests/qapi-schema/args-alternate.exit b/qemu/tests/qapi-schema/args-alternate.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-alternate.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-alternate.json b/qemu/tests/qapi-schema/args-alternate.json
deleted file mode 100644
index 69e94d481..000000000
--- a/qemu/tests/qapi-schema/args-alternate.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we do not allow alternate arguments
-{ 'alternate': 'Alt', 'data': { 'case1': 'int', 'case2': 'str' } }
-{ 'command': 'oops', 'data': 'Alt' }
diff --git a/qemu/tests/qapi-schema/args-alternate.out b/qemu/tests/qapi-schema/args-alternate.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-alternate.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-any.err b/qemu/tests/qapi-schema/args-any.err
deleted file mode 100644
index bf9b5e073..000000000
--- a/qemu/tests/qapi-schema/args-any.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-any.json:2: 'data' for command 'oops' cannot use built-in type 'any'
diff --git a/qemu/tests/qapi-schema/args-any.exit b/qemu/tests/qapi-schema/args-any.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-any.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-any.json b/qemu/tests/qapi-schema/args-any.json
deleted file mode 100644
index 58fe5e470..000000000
--- a/qemu/tests/qapi-schema/args-any.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we do not allow an 'any' argument
-{ 'command': 'oops', 'data': 'any' }
diff --git a/qemu/tests/qapi-schema/args-any.out b/qemu/tests/qapi-schema/args-any.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-any.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-array-empty.err b/qemu/tests/qapi-schema/args-array-empty.err
deleted file mode 100644
index cb7ed33b3..000000000
--- a/qemu/tests/qapi-schema/args-array-empty.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-array-empty.json:2: Member 'empty' of 'data' for command 'oops': array type must contain single type name
diff --git a/qemu/tests/qapi-schema/args-array-empty.exit b/qemu/tests/qapi-schema/args-array-empty.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-array-empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-array-empty.json b/qemu/tests/qapi-schema/args-array-empty.json
deleted file mode 100644
index 652dcfb24..000000000
--- a/qemu/tests/qapi-schema/args-array-empty.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an array for data if it does not contain a known type
-{ 'command': 'oops', 'data': { 'empty': [ ] } }
diff --git a/qemu/tests/qapi-schema/args-array-empty.out b/qemu/tests/qapi-schema/args-array-empty.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-array-empty.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-array-unknown.err b/qemu/tests/qapi-schema/args-array-unknown.err
deleted file mode 100644
index cd7a0f98d..000000000
--- a/qemu/tests/qapi-schema/args-array-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-array-unknown.json:2: Member 'array' of 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/qemu/tests/qapi-schema/args-array-unknown.exit b/qemu/tests/qapi-schema/args-array-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-array-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-array-unknown.json b/qemu/tests/qapi-schema/args-array-unknown.json
deleted file mode 100644
index 6f3e88331..000000000
--- a/qemu/tests/qapi-schema/args-array-unknown.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an array for data if it does not contain a known type
-{ 'command': 'oops', 'data': { 'array': [ 'NoSuchType' ] } }
diff --git a/qemu/tests/qapi-schema/args-array-unknown.out b/qemu/tests/qapi-schema/args-array-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-array-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-int.err b/qemu/tests/qapi-schema/args-int.err
deleted file mode 100644
index dc1d2504f..000000000
--- a/qemu/tests/qapi-schema/args-int.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-int.json:2: 'data' for command 'oops' cannot use built-in type 'int'
diff --git a/qemu/tests/qapi-schema/args-int.exit b/qemu/tests/qapi-schema/args-int.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-int.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-int.json b/qemu/tests/qapi-schema/args-int.json
deleted file mode 100644
index a334d92e8..000000000
--- a/qemu/tests/qapi-schema/args-int.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject commands where data is not an array or complex type
-{ 'command': 'oops', 'data': 'int' }
diff --git a/qemu/tests/qapi-schema/args-int.out b/qemu/tests/qapi-schema/args-int.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-int.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-invalid.err b/qemu/tests/qapi-schema/args-invalid.err
deleted file mode 100644
index fe1e94975..000000000
--- a/qemu/tests/qapi-schema/args-invalid.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-invalid.json:1: 'data' for command 'foo' should be a dictionary or type name
diff --git a/qemu/tests/qapi-schema/args-invalid.exit b/qemu/tests/qapi-schema/args-invalid.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-invalid.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-invalid.json b/qemu/tests/qapi-schema/args-invalid.json
deleted file mode 100644
index db0981341..000000000
--- a/qemu/tests/qapi-schema/args-invalid.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'command': 'foo',
- 'data': false }
diff --git a/qemu/tests/qapi-schema/args-invalid.out b/qemu/tests/qapi-schema/args-invalid.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-invalid.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-member-array-bad.err b/qemu/tests/qapi-schema/args-member-array-bad.err
deleted file mode 100644
index 881b4d954..000000000
--- a/qemu/tests/qapi-schema/args-member-array-bad.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-member-array-bad.json:2: Member 'member' of 'data' for command 'oops': array type must contain single type name
diff --git a/qemu/tests/qapi-schema/args-member-array-bad.exit b/qemu/tests/qapi-schema/args-member-array-bad.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-member-array-bad.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-member-array-bad.json b/qemu/tests/qapi-schema/args-member-array-bad.json
deleted file mode 100644
index b2ff144ec..000000000
--- a/qemu/tests/qapi-schema/args-member-array-bad.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject data if it does not contain a valid array type
-{ 'command': 'oops', 'data': { 'member': [ { 'nested': 'str' } ] } }
diff --git a/qemu/tests/qapi-schema/args-member-array-bad.out b/qemu/tests/qapi-schema/args-member-array-bad.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-member-array-bad.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-member-case.err b/qemu/tests/qapi-schema/args-member-case.err
deleted file mode 100644
index 19c442660..000000000
--- a/qemu/tests/qapi-schema/args-member-case.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-member-case.json:2: 'Arg' (parameter of no-way-this-will-get-whitelisted) should not use uppercase
diff --git a/qemu/tests/qapi-schema/args-member-case.exit b/qemu/tests/qapi-schema/args-member-case.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-member-case.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-member-case.json b/qemu/tests/qapi-schema/args-member-case.json
deleted file mode 100644
index 93439bee8..000000000
--- a/qemu/tests/qapi-schema/args-member-case.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# Member names should be 'lower-case' unless the struct/command is whitelisted
-{ 'command': 'no-way-this-will-get-whitelisted', 'data': { 'Arg': 'int' } }
diff --git a/qemu/tests/qapi-schema/args-member-case.out b/qemu/tests/qapi-schema/args-member-case.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-member-case.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-member-unknown.err b/qemu/tests/qapi-schema/args-member-unknown.err
deleted file mode 100644
index f6f82828c..000000000
--- a/qemu/tests/qapi-schema/args-member-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-member-unknown.json:2: Member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/qemu/tests/qapi-schema/args-member-unknown.exit b/qemu/tests/qapi-schema/args-member-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-member-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-member-unknown.json b/qemu/tests/qapi-schema/args-member-unknown.json
deleted file mode 100644
index 342a41ec9..000000000
--- a/qemu/tests/qapi-schema/args-member-unknown.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject data if it does not contain a known type
-{ 'command': 'oops', 'data': { 'member': 'NoSuchType' } }
diff --git a/qemu/tests/qapi-schema/args-member-unknown.out b/qemu/tests/qapi-schema/args-member-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-member-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-name-clash.err b/qemu/tests/qapi-schema/args-name-clash.err
deleted file mode 100644
index d953e8d24..000000000
--- a/qemu/tests/qapi-schema/args-name-clash.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-name-clash.json:4: 'a_b' (parameter of oops) collides with 'a-b' (parameter of oops)
diff --git a/qemu/tests/qapi-schema/args-name-clash.exit b/qemu/tests/qapi-schema/args-name-clash.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-name-clash.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-name-clash.json b/qemu/tests/qapi-schema/args-name-clash.json
deleted file mode 100644
index 61423cb89..000000000
--- a/qemu/tests/qapi-schema/args-name-clash.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# C member name collision
-# Reject members that clash when mapped to C names (we would have two 'a_b'
-# members).
-{ 'command': 'oops', 'data': { 'a-b': 'str', 'a_b': 'str' } }
diff --git a/qemu/tests/qapi-schema/args-name-clash.out b/qemu/tests/qapi-schema/args-name-clash.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-name-clash.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-union.err b/qemu/tests/qapi-schema/args-union.err
deleted file mode 100644
index 1d693d74d..000000000
--- a/qemu/tests/qapi-schema/args-union.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-union.json:4: 'data' for command 'oops' cannot use union type 'Uni'
diff --git a/qemu/tests/qapi-schema/args-union.exit b/qemu/tests/qapi-schema/args-union.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-union.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-union.json b/qemu/tests/qapi-schema/args-union.json
deleted file mode 100644
index 7bdcbb7f0..000000000
--- a/qemu/tests/qapi-schema/args-union.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# we do not allow union arguments
-# TODO should we support this?
-{ 'union': 'Uni', 'data': { 'case1': 'int', 'case2': 'str' } }
-{ 'command': 'oops', 'data': 'Uni' }
diff --git a/qemu/tests/qapi-schema/args-union.out b/qemu/tests/qapi-schema/args-union.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-union.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/args-unknown.err b/qemu/tests/qapi-schema/args-unknown.err
deleted file mode 100644
index 4d91ec869..000000000
--- a/qemu/tests/qapi-schema/args-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/args-unknown.json:2: 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/qemu/tests/qapi-schema/args-unknown.exit b/qemu/tests/qapi-schema/args-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/args-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/args-unknown.json b/qemu/tests/qapi-schema/args-unknown.json
deleted file mode 100644
index 32aba43b3..000000000
--- a/qemu/tests/qapi-schema/args-unknown.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject data if it does not contain a known type
-{ 'command': 'oops', 'data': 'NoSuchType' }
diff --git a/qemu/tests/qapi-schema/args-unknown.out b/qemu/tests/qapi-schema/args-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/args-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-base.err b/qemu/tests/qapi-schema/bad-base.err
deleted file mode 100644
index 154274bdd..000000000
--- a/qemu/tests/qapi-schema/bad-base.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-base.json:3: 'base' for struct 'MyType' cannot use union type 'Union'
diff --git a/qemu/tests/qapi-schema/bad-base.exit b/qemu/tests/qapi-schema/bad-base.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-base.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-base.json b/qemu/tests/qapi-schema/bad-base.json
deleted file mode 100644
index a634331cd..000000000
--- a/qemu/tests/qapi-schema/bad-base.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject a base that is not a struct
-{ 'union': 'Union', 'data': { 'a': 'int', 'b': 'str' } }
-{ 'struct': 'MyType', 'base': 'Union', 'data': { 'c': 'int' } }
diff --git a/qemu/tests/qapi-schema/bad-base.out b/qemu/tests/qapi-schema/bad-base.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-base.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-data.err b/qemu/tests/qapi-schema/bad-data.err
deleted file mode 100644
index 8523ac4f4..000000000
--- a/qemu/tests/qapi-schema/bad-data.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-data.json:2: 'data' for command 'oops' cannot be an array
diff --git a/qemu/tests/qapi-schema/bad-data.exit b/qemu/tests/qapi-schema/bad-data.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-data.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-data.json b/qemu/tests/qapi-schema/bad-data.json
deleted file mode 100644
index 832eeb76f..000000000
--- a/qemu/tests/qapi-schema/bad-data.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we ensure 'data' is a dictionary for all but enums
-{ 'command': 'oops', 'data': [ ] }
diff --git a/qemu/tests/qapi-schema/bad-data.out b/qemu/tests/qapi-schema/bad-data.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-data.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-ident.err b/qemu/tests/qapi-schema/bad-ident.err
deleted file mode 100644
index c4190602b..000000000
--- a/qemu/tests/qapi-schema/bad-ident.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-ident.json:2: 'struct' does not allow optional name '*oops'
diff --git a/qemu/tests/qapi-schema/bad-ident.exit b/qemu/tests/qapi-schema/bad-ident.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-ident.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-ident.json b/qemu/tests/qapi-schema/bad-ident.json
deleted file mode 100644
index 763627ad2..000000000
--- a/qemu/tests/qapi-schema/bad-ident.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject creating a type name with bad name
-{ 'struct': '*oops', 'data': { 'i': 'int' } }
diff --git a/qemu/tests/qapi-schema/bad-ident.out b/qemu/tests/qapi-schema/bad-ident.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-ident.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-type-bool.err b/qemu/tests/qapi-schema/bad-type-bool.err
deleted file mode 100644
index 62fd70baa..000000000
--- a/qemu/tests/qapi-schema/bad-type-bool.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-type-bool.json:2: 'struct' key must have a string value
diff --git a/qemu/tests/qapi-schema/bad-type-bool.exit b/qemu/tests/qapi-schema/bad-type-bool.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-type-bool.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-type-bool.json b/qemu/tests/qapi-schema/bad-type-bool.json
deleted file mode 100644
index bde17b56c..000000000
--- a/qemu/tests/qapi-schema/bad-type-bool.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with a metatype that is not a string
-{ 'struct': true, 'data': { } }
diff --git a/qemu/tests/qapi-schema/bad-type-bool.out b/qemu/tests/qapi-schema/bad-type-bool.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-type-bool.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-type-dict.err b/qemu/tests/qapi-schema/bad-type-dict.err
deleted file mode 100644
index 0b2a2aeac..000000000
--- a/qemu/tests/qapi-schema/bad-type-dict.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-type-dict.json:2: 'command' key must have a string value
diff --git a/qemu/tests/qapi-schema/bad-type-dict.exit b/qemu/tests/qapi-schema/bad-type-dict.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-type-dict.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-type-dict.json b/qemu/tests/qapi-schema/bad-type-dict.json
deleted file mode 100644
index 2a91b241f..000000000
--- a/qemu/tests/qapi-schema/bad-type-dict.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with a metatype that is not a string
-{ 'command': { } }
diff --git a/qemu/tests/qapi-schema/bad-type-dict.out b/qemu/tests/qapi-schema/bad-type-dict.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-type-dict.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/bad-type-int.err b/qemu/tests/qapi-schema/bad-type-int.err
deleted file mode 100644
index da8989540..000000000
--- a/qemu/tests/qapi-schema/bad-type-int.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/bad-type-int.json:3:13: Stray "1"
diff --git a/qemu/tests/qapi-schema/bad-type-int.exit b/qemu/tests/qapi-schema/bad-type-int.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/bad-type-int.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/bad-type-int.json b/qemu/tests/qapi-schema/bad-type-int.json
deleted file mode 100644
index 56fc6f812..000000000
--- a/qemu/tests/qapi-schema/bad-type-int.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject an expression with a metatype that is not a string
-# FIXME: once the parser understands integer inputs, improve the error message
-{ 'struct': 1, 'data': { } }
diff --git a/qemu/tests/qapi-schema/bad-type-int.out b/qemu/tests/qapi-schema/bad-type-int.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/bad-type-int.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/base-cycle-direct.err b/qemu/tests/qapi-schema/base-cycle-direct.err
deleted file mode 100644
index 9c68f6543..000000000
--- a/qemu/tests/qapi-schema/base-cycle-direct.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/base-cycle-direct.json:2: Object Loopy contains itself
diff --git a/qemu/tests/qapi-schema/base-cycle-direct.exit b/qemu/tests/qapi-schema/base-cycle-direct.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/base-cycle-direct.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/base-cycle-direct.json b/qemu/tests/qapi-schema/base-cycle-direct.json
deleted file mode 100644
index 4fc66d051..000000000
--- a/qemu/tests/qapi-schema/base-cycle-direct.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject a loop in base classes
-{ 'struct': 'Loopy', 'base': 'Loopy', 'data': {} }
diff --git a/qemu/tests/qapi-schema/base-cycle-direct.out b/qemu/tests/qapi-schema/base-cycle-direct.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/base-cycle-direct.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/base-cycle-indirect.err b/qemu/tests/qapi-schema/base-cycle-indirect.err
deleted file mode 100644
index fc92fe47f..000000000
--- a/qemu/tests/qapi-schema/base-cycle-indirect.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/base-cycle-indirect.json:2: Object Base1 contains itself
diff --git a/qemu/tests/qapi-schema/base-cycle-indirect.exit b/qemu/tests/qapi-schema/base-cycle-indirect.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/base-cycle-indirect.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/base-cycle-indirect.json b/qemu/tests/qapi-schema/base-cycle-indirect.json
deleted file mode 100644
index 28667721a..000000000
--- a/qemu/tests/qapi-schema/base-cycle-indirect.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject a loop in base classes
-{ 'struct': 'Base1', 'base': 'Base2', 'data': {} }
-{ 'struct': 'Base2', 'base': 'Base1', 'data': {} }
diff --git a/qemu/tests/qapi-schema/base-cycle-indirect.out b/qemu/tests/qapi-schema/base-cycle-indirect.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/base-cycle-indirect.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/command-int.err b/qemu/tests/qapi-schema/command-int.err
deleted file mode 100644
index 0f9300679..000000000
--- a/qemu/tests/qapi-schema/command-int.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/command-int.json:2: built-in 'int' is already defined
diff --git a/qemu/tests/qapi-schema/command-int.exit b/qemu/tests/qapi-schema/command-int.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/command-int.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/command-int.json b/qemu/tests/qapi-schema/command-int.json
deleted file mode 100644
index 9a62554fc..000000000
--- a/qemu/tests/qapi-schema/command-int.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject collisions between commands and types
-{ 'command': 'int', 'data': { 'character': 'str' } }
diff --git a/qemu/tests/qapi-schema/command-int.out b/qemu/tests/qapi-schema/command-int.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/command-int.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/comments.err b/qemu/tests/qapi-schema/comments.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/comments.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/comments.exit b/qemu/tests/qapi-schema/comments.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/comments.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/comments.json b/qemu/tests/qapi-schema/comments.json
deleted file mode 100644
index e643f3a74..000000000
--- a/qemu/tests/qapi-schema/comments.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unindented comment
-{ 'enum': 'Status', # Comment to the right of code
- # Indented comment
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/comments.out b/qemu/tests/qapi-schema/comments.out
deleted file mode 100644
index 5d7c13cad..000000000
--- a/qemu/tests/qapi-schema/comments.out
+++ /dev/null
@@ -1,4 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-enum Status ['good', 'bad', 'ugly']
-object q_empty
diff --git a/qemu/tests/qapi-schema/double-data.err b/qemu/tests/qapi-schema/double-data.err
deleted file mode 100644
index cc765c4ff..000000000
--- a/qemu/tests/qapi-schema/double-data.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/double-data.json:2:41: Duplicate key "data"
diff --git a/qemu/tests/qapi-schema/double-data.exit b/qemu/tests/qapi-schema/double-data.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/double-data.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/double-data.json b/qemu/tests/qapi-schema/double-data.json
deleted file mode 100644
index e76b51953..000000000
--- a/qemu/tests/qapi-schema/double-data.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with duplicate top-level keys
-{ 'struct': 'bar', 'data': { }, 'data': { 'string': 'str'} }
diff --git a/qemu/tests/qapi-schema/double-data.out b/qemu/tests/qapi-schema/double-data.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/double-data.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/double-type.err b/qemu/tests/qapi-schema/double-type.err
deleted file mode 100644
index f9613c6d6..000000000
--- a/qemu/tests/qapi-schema/double-type.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/double-type.json:2: Unknown key 'command' in struct 'bar'
diff --git a/qemu/tests/qapi-schema/double-type.exit b/qemu/tests/qapi-schema/double-type.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/double-type.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/double-type.json b/qemu/tests/qapi-schema/double-type.json
deleted file mode 100644
index 911fa7af5..000000000
--- a/qemu/tests/qapi-schema/double-type.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with ambiguous metatype
-{ 'command': 'foo', 'struct': 'bar', 'data': { } }
diff --git a/qemu/tests/qapi-schema/double-type.out b/qemu/tests/qapi-schema/double-type.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/double-type.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/duplicate-key.err b/qemu/tests/qapi-schema/duplicate-key.err
deleted file mode 100644
index 6d02f8353..000000000
--- a/qemu/tests/qapi-schema/duplicate-key.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/duplicate-key.json:3:10: Duplicate key "key"
diff --git a/qemu/tests/qapi-schema/duplicate-key.exit b/qemu/tests/qapi-schema/duplicate-key.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/duplicate-key.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/duplicate-key.json b/qemu/tests/qapi-schema/duplicate-key.json
deleted file mode 100644
index 14ac0e8a4..000000000
--- a/qemu/tests/qapi-schema/duplicate-key.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# QAPI cannot include the same key more than once in any {}
-{ 'key': 'value',
- 'key': 'value' }
diff --git a/qemu/tests/qapi-schema/duplicate-key.out b/qemu/tests/qapi-schema/duplicate-key.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/duplicate-key.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/empty.err b/qemu/tests/qapi-schema/empty.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/empty.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/empty.exit b/qemu/tests/qapi-schema/empty.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/empty.json b/qemu/tests/qapi-schema/empty.json
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/empty.json
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/empty.out b/qemu/tests/qapi-schema/empty.out
deleted file mode 100644
index 8a5b03442..000000000
--- a/qemu/tests/qapi-schema/empty.out
+++ /dev/null
@@ -1,3 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-object q_empty
diff --git a/qemu/tests/qapi-schema/enum-bad-name.err b/qemu/tests/qapi-schema/enum-bad-name.err
deleted file mode 100644
index 9c3c1002b..000000000
--- a/qemu/tests/qapi-schema/enum-bad-name.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-bad-name.json:2: Member of enum 'MyEnum' uses invalid name 'not^possible'
diff --git a/qemu/tests/qapi-schema/enum-bad-name.exit b/qemu/tests/qapi-schema/enum-bad-name.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-bad-name.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-bad-name.json b/qemu/tests/qapi-schema/enum-bad-name.json
deleted file mode 100644
index 8506562b3..000000000
--- a/qemu/tests/qapi-schema/enum-bad-name.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we ensure all enum names can map to C
-{ 'enum': 'MyEnum', 'data': [ 'not^possible' ] }
diff --git a/qemu/tests/qapi-schema/enum-bad-name.out b/qemu/tests/qapi-schema/enum-bad-name.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-bad-name.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-bad-prefix.err b/qemu/tests/qapi-schema/enum-bad-prefix.err
deleted file mode 100644
index 399f5f7af..000000000
--- a/qemu/tests/qapi-schema/enum-bad-prefix.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-bad-prefix.json:2: Enum 'MyEnum' requires a string for 'prefix'
diff --git a/qemu/tests/qapi-schema/enum-bad-prefix.exit b/qemu/tests/qapi-schema/enum-bad-prefix.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-bad-prefix.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-bad-prefix.json b/qemu/tests/qapi-schema/enum-bad-prefix.json
deleted file mode 100644
index 996f628f6..000000000
--- a/qemu/tests/qapi-schema/enum-bad-prefix.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# The prefix must be a string type
-{ 'enum': 'MyEnum', 'data': [ 'one' ], 'prefix': [ 'fish' ] }
diff --git a/qemu/tests/qapi-schema/enum-bad-prefix.out b/qemu/tests/qapi-schema/enum-bad-prefix.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-bad-prefix.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-clash-member.err b/qemu/tests/qapi-schema/enum-clash-member.err
deleted file mode 100644
index 5403c7850..000000000
--- a/qemu/tests/qapi-schema/enum-clash-member.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-clash-member.json:2: 'one_two' (member of MyEnum) collides with 'one-two' (member of MyEnum)
diff --git a/qemu/tests/qapi-schema/enum-clash-member.exit b/qemu/tests/qapi-schema/enum-clash-member.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-clash-member.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-clash-member.json b/qemu/tests/qapi-schema/enum-clash-member.json
deleted file mode 100644
index b6928b8bf..000000000
--- a/qemu/tests/qapi-schema/enum-clash-member.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject enums where members will clash when mapped to C enum
-{ 'enum': 'MyEnum', 'data': [ 'one-two', 'one_two' ] }
diff --git a/qemu/tests/qapi-schema/enum-clash-member.out b/qemu/tests/qapi-schema/enum-clash-member.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-clash-member.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-dict-member.err b/qemu/tests/qapi-schema/enum-dict-member.err
deleted file mode 100644
index 8ca146ea5..000000000
--- a/qemu/tests/qapi-schema/enum-dict-member.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-dict-member.json:2: Member of enum 'MyEnum' requires a string name
diff --git a/qemu/tests/qapi-schema/enum-dict-member.exit b/qemu/tests/qapi-schema/enum-dict-member.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-dict-member.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-dict-member.json b/qemu/tests/qapi-schema/enum-dict-member.json
deleted file mode 100644
index 79672e0f0..000000000
--- a/qemu/tests/qapi-schema/enum-dict-member.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject any enum member that is not a string
-{ 'enum': 'MyEnum', 'data': [ { 'value': 'str' } ] }
diff --git a/qemu/tests/qapi-schema/enum-dict-member.out b/qemu/tests/qapi-schema/enum-dict-member.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-dict-member.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-int-member.err b/qemu/tests/qapi-schema/enum-int-member.err
deleted file mode 100644
index 071c5213d..000000000
--- a/qemu/tests/qapi-schema/enum-int-member.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-int-member.json:3:31: Stray "1"
diff --git a/qemu/tests/qapi-schema/enum-int-member.exit b/qemu/tests/qapi-schema/enum-int-member.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-int-member.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-int-member.json b/qemu/tests/qapi-schema/enum-int-member.json
deleted file mode 100644
index 6c9c32e14..000000000
--- a/qemu/tests/qapi-schema/enum-int-member.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject any enum member that is not a string
-# FIXME: once the parser understands integer inputs, improve the error message
-{ 'enum': 'MyEnum', 'data': [ 1 ] }
diff --git a/qemu/tests/qapi-schema/enum-int-member.out b/qemu/tests/qapi-schema/enum-int-member.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-int-member.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-member-case.err b/qemu/tests/qapi-schema/enum-member-case.err
deleted file mode 100644
index b652e9aac..000000000
--- a/qemu/tests/qapi-schema/enum-member-case.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-member-case.json:3: 'Value' (member of NoWayThisWillGetWhitelisted) should not use uppercase
diff --git a/qemu/tests/qapi-schema/enum-member-case.exit b/qemu/tests/qapi-schema/enum-member-case.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-member-case.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-member-case.json b/qemu/tests/qapi-schema/enum-member-case.json
deleted file mode 100644
index 2096b350c..000000000
--- a/qemu/tests/qapi-schema/enum-member-case.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# Member names should be 'lower-case' unless the enum is whitelisted
-{ 'enum': 'UuidInfo', 'data': [ 'Value' ] } # UuidInfo is whitelisted
-{ 'enum': 'NoWayThisWillGetWhitelisted', 'data': [ 'Value' ] }
diff --git a/qemu/tests/qapi-schema/enum-member-case.out b/qemu/tests/qapi-schema/enum-member-case.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-member-case.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-missing-data.err b/qemu/tests/qapi-schema/enum-missing-data.err
deleted file mode 100644
index ba4873ae6..000000000
--- a/qemu/tests/qapi-schema/enum-missing-data.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-missing-data.json:2: Key 'data' is missing from enum 'MyEnum'
diff --git a/qemu/tests/qapi-schema/enum-missing-data.exit b/qemu/tests/qapi-schema/enum-missing-data.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-missing-data.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-missing-data.json b/qemu/tests/qapi-schema/enum-missing-data.json
deleted file mode 100644
index 558fd35e9..000000000
--- a/qemu/tests/qapi-schema/enum-missing-data.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we require that all QAPI enums have a data array
-{ 'enum': 'MyEnum' }
diff --git a/qemu/tests/qapi-schema/enum-missing-data.out b/qemu/tests/qapi-schema/enum-missing-data.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-missing-data.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/enum-wrong-data.err b/qemu/tests/qapi-schema/enum-wrong-data.err
deleted file mode 100644
index 11b43471c..000000000
--- a/qemu/tests/qapi-schema/enum-wrong-data.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/enum-wrong-data.json:2: Enum 'MyEnum' requires an array for 'data'
diff --git a/qemu/tests/qapi-schema/enum-wrong-data.exit b/qemu/tests/qapi-schema/enum-wrong-data.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/enum-wrong-data.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/enum-wrong-data.json b/qemu/tests/qapi-schema/enum-wrong-data.json
deleted file mode 100644
index 7b3e255c1..000000000
--- a/qemu/tests/qapi-schema/enum-wrong-data.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we require that all qapi enums have an array for data
-{ 'enum': 'MyEnum', 'data': { 'value': 'str' } }
diff --git a/qemu/tests/qapi-schema/enum-wrong-data.out b/qemu/tests/qapi-schema/enum-wrong-data.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/enum-wrong-data.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/escape-outside-string.err b/qemu/tests/qapi-schema/escape-outside-string.err
deleted file mode 100644
index b9b8837fd..000000000
--- a/qemu/tests/qapi-schema/escape-outside-string.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/escape-outside-string.json:3:27: Stray "\"
diff --git a/qemu/tests/qapi-schema/escape-outside-string.exit b/qemu/tests/qapi-schema/escape-outside-string.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/escape-outside-string.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/escape-outside-string.json b/qemu/tests/qapi-schema/escape-outside-string.json
deleted file mode 100644
index 482f79554..000000000
--- a/qemu/tests/qapi-schema/escape-outside-string.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# escape sequences are permitted only inside strings
-# { 'command': 'foo', 'data': {} }
-{ 'command': 'foo', 'data'\u003a{} }
diff --git a/qemu/tests/qapi-schema/escape-outside-string.out b/qemu/tests/qapi-schema/escape-outside-string.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/escape-outside-string.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/escape-too-big.err b/qemu/tests/qapi-schema/escape-too-big.err
deleted file mode 100644
index d9aeb5dc3..000000000
--- a/qemu/tests/qapi-schema/escape-too-big.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/escape-too-big.json:3:14: For now, \u escape only supports non-zero values up to \u007f
diff --git a/qemu/tests/qapi-schema/escape-too-big.exit b/qemu/tests/qapi-schema/escape-too-big.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/escape-too-big.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/escape-too-big.json b/qemu/tests/qapi-schema/escape-too-big.json
deleted file mode 100644
index 62bcecd55..000000000
--- a/qemu/tests/qapi-schema/escape-too-big.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we don't support full Unicode strings, yet
-# { 'command': 'é' }
-{ 'command': '\u00e9' }
diff --git a/qemu/tests/qapi-schema/escape-too-big.out b/qemu/tests/qapi-schema/escape-too-big.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/escape-too-big.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/escape-too-short.err b/qemu/tests/qapi-schema/escape-too-short.err
deleted file mode 100644
index 934de598e..000000000
--- a/qemu/tests/qapi-schema/escape-too-short.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/escape-too-short.json:3:14: \u escape needs 4 hex digits
diff --git a/qemu/tests/qapi-schema/escape-too-short.exit b/qemu/tests/qapi-schema/escape-too-short.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/escape-too-short.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/escape-too-short.json b/qemu/tests/qapi-schema/escape-too-short.json
deleted file mode 100644
index 6cb1dec8f..000000000
--- a/qemu/tests/qapi-schema/escape-too-short.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# the \u escape requires 4 hex digits
-# { 'command': 'a' }
-{ 'command': '\u61' }
diff --git a/qemu/tests/qapi-schema/escape-too-short.out b/qemu/tests/qapi-schema/escape-too-short.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/escape-too-short.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/event-case.err b/qemu/tests/qapi-schema/event-case.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/event-case.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/event-case.exit b/qemu/tests/qapi-schema/event-case.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/event-case.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/event-case.json b/qemu/tests/qapi-schema/event-case.json
deleted file mode 100644
index 3a92d8b61..000000000
--- a/qemu/tests/qapi-schema/event-case.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# TODO: might be nice to enforce naming conventions; but until then this works
-# even though events should usually be ALL_CAPS
-{ 'event': 'oops' }
diff --git a/qemu/tests/qapi-schema/event-case.out b/qemu/tests/qapi-schema/event-case.out
deleted file mode 100644
index b6b4134a8..000000000
--- a/qemu/tests/qapi-schema/event-case.out
+++ /dev/null
@@ -1,4 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-event oops None
-object q_empty
diff --git a/qemu/tests/qapi-schema/event-nest-struct.err b/qemu/tests/qapi-schema/event-nest-struct.err
deleted file mode 100644
index 5a42701b8..000000000
--- a/qemu/tests/qapi-schema/event-nest-struct.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/event-nest-struct.json:1: Member 'a' of 'data' for event 'EVENT_A' should be a type name
diff --git a/qemu/tests/qapi-schema/event-nest-struct.exit b/qemu/tests/qapi-schema/event-nest-struct.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/event-nest-struct.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/event-nest-struct.json b/qemu/tests/qapi-schema/event-nest-struct.json
deleted file mode 100644
index ee6f3ecb6..000000000
--- a/qemu/tests/qapi-schema/event-nest-struct.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'event': 'EVENT_A',
- 'data': { 'a' : { 'string' : 'str', 'integer': 'int' }, 'b' : 'str' } }
diff --git a/qemu/tests/qapi-schema/event-nest-struct.out b/qemu/tests/qapi-schema/event-nest-struct.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/event-nest-struct.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-array-branch.err b/qemu/tests/qapi-schema/flat-union-array-branch.err
deleted file mode 100644
index 8ea91eadb..000000000
--- a/qemu/tests/qapi-schema/flat-union-array-branch.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-array-branch.json:8: Member 'value1' of union 'TestUnion' cannot be an array
diff --git a/qemu/tests/qapi-schema/flat-union-array-branch.exit b/qemu/tests/qapi-schema/flat-union-array-branch.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-array-branch.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-array-branch.json b/qemu/tests/qapi-schema/flat-union-array-branch.json
deleted file mode 100644
index 0b98820a8..000000000
--- a/qemu/tests/qapi-schema/flat-union-array-branch.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# we require flat union branches to be a struct
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'Base',
- 'data': { 'enum1': 'TestEnum' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'TestUnion',
- 'base': 'Base',
- 'discriminator': 'enum1',
- 'data': { 'value1': ['TestTypeB'],
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-array-branch.out b/qemu/tests/qapi-schema/flat-union-array-branch.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-array-branch.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-bad-base.err b/qemu/tests/qapi-schema/flat-union-bad-base.err
deleted file mode 100644
index bee24a217..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-base.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-bad-base.json:8: 'string' (member of TestTypeA) collides with 'string' (base of TestUnion)
diff --git a/qemu/tests/qapi-schema/flat-union-bad-base.exit b/qemu/tests/qapi-schema/flat-union-bad-base.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-base.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-bad-base.json b/qemu/tests/qapi-schema/flat-union-bad-base.json
deleted file mode 100644
index 74dd42170..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-base.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# we allow anonymous base, but enforce no duplicate keys
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'TestUnion',
- 'base': { 'enum1': 'TestEnum', 'string': 'str' },
- 'discriminator': 'enum1',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-bad-base.out b/qemu/tests/qapi-schema/flat-union-bad-base.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-base.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-bad-discriminator.err b/qemu/tests/qapi-schema/flat-union-bad-discriminator.err
deleted file mode 100644
index c38cc8e4d..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-discriminator.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-bad-discriminator.json:11: Discriminator of flat union 'TestUnion' requires a string name
diff --git a/qemu/tests/qapi-schema/flat-union-bad-discriminator.exit b/qemu/tests/qapi-schema/flat-union-bad-discriminator.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-discriminator.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-bad-discriminator.json b/qemu/tests/qapi-schema/flat-union-bad-discriminator.json
deleted file mode 100644
index cd10b9d90..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-discriminator.json
+++ /dev/null
@@ -1,15 +0,0 @@
-# we require the discriminator to be a string naming a base-type member
-# this tests the old syntax for anonymous unions before we added alternates
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'TestBase',
- 'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'TestUnion',
- 'base': 'TestBase',
- 'discriminator': {},
- 'data': { 'kind1': 'TestTypeA',
- 'kind2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-bad-discriminator.out b/qemu/tests/qapi-schema/flat-union-bad-discriminator.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-bad-discriminator.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-base-any.err b/qemu/tests/qapi-schema/flat-union-base-any.err
deleted file mode 100644
index 646f1c9cd..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-any.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-base-any.json:8: 'base' for union 'TestUnion' cannot use built-in type 'any'
diff --git a/qemu/tests/qapi-schema/flat-union-base-any.exit b/qemu/tests/qapi-schema/flat-union-base-any.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-any.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-base-any.json b/qemu/tests/qapi-schema/flat-union-base-any.json
deleted file mode 100644
index fe66b713e..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-any.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# we require the base to be an existing struct
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'TestUnion',
- 'base': 'any',
- 'discriminator': 'enum1',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-base-any.out b/qemu/tests/qapi-schema/flat-union-base-any.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-any.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-base-union.err b/qemu/tests/qapi-schema/flat-union-base-union.err
deleted file mode 100644
index f138395e4..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-union.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-base-union.json:14: 'base' for union 'TestUnion' cannot use union type 'UnionBase'
diff --git a/qemu/tests/qapi-schema/flat-union-base-union.exit b/qemu/tests/qapi-schema/flat-union-base-union.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-union.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-base-union.json b/qemu/tests/qapi-schema/flat-union-base-union.json
deleted file mode 100644
index 98b4eba18..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-union.json
+++ /dev/null
@@ -1,18 +0,0 @@
-# For now, we require the base to be a struct without variants
-# TODO: It would be possible to allow a union as a base, as long as all
-# permutations of QMP names exposed by base do not clash with any QMP
-# member names added by local variants.
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'UnionBase',
- 'data': { 'kind1': 'TestTypeA',
- 'kind2': 'TestTypeB' } }
-{ 'union': 'TestUnion',
- 'base': 'UnionBase',
- 'discriminator': 'type',
- 'data': { 'kind1': 'TestTypeA',
- 'kind2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-base-union.out b/qemu/tests/qapi-schema/flat-union-base-union.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-base-union.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-clash-member.err b/qemu/tests/qapi-schema/flat-union-clash-member.err
deleted file mode 100644
index 2adf69755..000000000
--- a/qemu/tests/qapi-schema/flat-union-clash-member.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-clash-member.json:11: 'name' (member of Branch1) collides with 'name' (member of Base)
diff --git a/qemu/tests/qapi-schema/flat-union-clash-member.exit b/qemu/tests/qapi-schema/flat-union-clash-member.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-clash-member.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-clash-member.json b/qemu/tests/qapi-schema/flat-union-clash-member.json
deleted file mode 100644
index 9efc7719b..000000000
--- a/qemu/tests/qapi-schema/flat-union-clash-member.json
+++ /dev/null
@@ -1,15 +0,0 @@
-# We check for no duplicate keys between branch members and base
-# base's member 'name' clashes with Branch1's
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'Base',
- 'data': { 'enum1': 'TestEnum', '*name': 'str' } }
-{ 'struct': 'Branch1',
- 'data': { 'name': 'str' } }
-{ 'struct': 'Branch2',
- 'data': { 'value': 'int' } }
-{ 'union': 'TestUnion',
- 'base': 'Base',
- 'discriminator': 'enum1',
- 'data': { 'value1': 'Branch1',
- 'value2': 'Branch2' } }
diff --git a/qemu/tests/qapi-schema/flat-union-clash-member.out b/qemu/tests/qapi-schema/flat-union-clash-member.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-clash-member.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-empty.err b/qemu/tests/qapi-schema/flat-union-empty.err
deleted file mode 100644
index 15754f54e..000000000
--- a/qemu/tests/qapi-schema/flat-union-empty.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-empty.json:4: Union 'Union' cannot have empty 'data'
diff --git a/qemu/tests/qapi-schema/flat-union-empty.exit b/qemu/tests/qapi-schema/flat-union-empty.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-empty.json b/qemu/tests/qapi-schema/flat-union-empty.json
deleted file mode 100644
index 77f1d9abf..000000000
--- a/qemu/tests/qapi-schema/flat-union-empty.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# flat unions cannot be empty
-{ 'enum': 'Empty', 'data': [ ] }
-{ 'struct': 'Base', 'data': { 'type': 'Empty' } }
-{ 'union': 'Union', 'base': 'Base', 'discriminator': 'type', 'data': { } }
diff --git a/qemu/tests/qapi-schema/flat-union-empty.out b/qemu/tests/qapi-schema/flat-union-empty.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-empty.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-inline.err b/qemu/tests/qapi-schema/flat-union-inline.err
deleted file mode 100644
index 2333358d2..000000000
--- a/qemu/tests/qapi-schema/flat-union-inline.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-inline.json:7: Member 'value1' of union 'TestUnion' should be a type name
diff --git a/qemu/tests/qapi-schema/flat-union-inline.exit b/qemu/tests/qapi-schema/flat-union-inline.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-inline.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-inline.json b/qemu/tests/qapi-schema/flat-union-inline.json
deleted file mode 100644
index 62c7cda61..000000000
--- a/qemu/tests/qapi-schema/flat-union-inline.json
+++ /dev/null
@@ -1,11 +0,0 @@
-# we require branches to be a struct name
-# TODO: should we allow anonymous inline branch types?
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'Base',
- 'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
-{ 'union': 'TestUnion',
- 'base': 'Base',
- 'discriminator': 'enum1',
- 'data': { 'value1': { 'string': 'str' },
- 'value2': { 'integer': 'int' } } }
diff --git a/qemu/tests/qapi-schema/flat-union-inline.out b/qemu/tests/qapi-schema/flat-union-inline.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-inline.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-int-branch.err b/qemu/tests/qapi-schema/flat-union-int-branch.err
deleted file mode 100644
index faf01573b..000000000
--- a/qemu/tests/qapi-schema/flat-union-int-branch.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-int-branch.json:8: Member 'value1' of union 'TestUnion' cannot use built-in type 'int'
diff --git a/qemu/tests/qapi-schema/flat-union-int-branch.exit b/qemu/tests/qapi-schema/flat-union-int-branch.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-int-branch.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-int-branch.json b/qemu/tests/qapi-schema/flat-union-int-branch.json
deleted file mode 100644
index 9370c349e..000000000
--- a/qemu/tests/qapi-schema/flat-union-int-branch.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# we require flat union branches to be a struct
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-{ 'struct': 'Base',
- 'data': { 'enum1': 'TestEnum' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'union': 'TestUnion',
- 'base': 'Base',
- 'discriminator': 'enum1',
- 'data': { 'value1': 'int',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-int-branch.out b/qemu/tests/qapi-schema/flat-union-int-branch.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-int-branch.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.err b/qemu/tests/qapi-schema/flat-union-invalid-branch-key.err
deleted file mode 100644
index ccf72d2df..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-invalid-branch-key.json:13: Discriminator value 'value_wrong' is not found in enum 'TestEnum'
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.exit b/qemu/tests/qapi-schema/flat-union-invalid-branch-key.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.json b/qemu/tests/qapi-schema/flat-union-invalid-branch-key.json
deleted file mode 100644
index 95ff7746b..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-
-{ 'struct': 'TestBase',
- 'data': { 'enum1': 'TestEnum' } }
-
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-
-{ 'union': 'TestUnion',
- 'base': 'TestBase',
- 'discriminator': 'enum1',
- 'data': { 'value_wrong': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.out b/qemu/tests/qapi-schema/flat-union-invalid-branch-key.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-branch-key.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.err b/qemu/tests/qapi-schema/flat-union-invalid-discriminator.err
deleted file mode 100644
index 5f4055614..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-invalid-discriminator.json:13: Discriminator 'enum_wrong' is not a member of base struct 'TestBase'
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.exit b/qemu/tests/qapi-schema/flat-union-invalid-discriminator.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.json b/qemu/tests/qapi-schema/flat-union-invalid-discriminator.json
deleted file mode 100644
index 48b94c3a4..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-
-{ 'struct': 'TestBase',
- 'data': { 'enum1': 'TestEnum' } }
-
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-
-{ 'union': 'TestUnion',
- 'base': 'TestBase',
- 'discriminator': 'enum_wrong',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.out b/qemu/tests/qapi-schema/flat-union-invalid-discriminator.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-invalid-discriminator.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-no-base.err b/qemu/tests/qapi-schema/flat-union-no-base.err
deleted file mode 100644
index 841c93b55..000000000
--- a/qemu/tests/qapi-schema/flat-union-no-base.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-no-base.json:9: Flat union 'TestUnion' must have a base
diff --git a/qemu/tests/qapi-schema/flat-union-no-base.exit b/qemu/tests/qapi-schema/flat-union-no-base.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-no-base.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-no-base.json b/qemu/tests/qapi-schema/flat-union-no-base.json
deleted file mode 100644
index ffc4c6f0e..000000000
--- a/qemu/tests/qapi-schema/flat-union-no-base.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# flat unions require a base
-# TODO: simple unions should be able to use an enum discriminator
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-{ 'enum': 'Enum',
- 'data': [ 'value1', 'value2' ] }
-{ 'union': 'TestUnion',
- 'discriminator': 'Enum',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-no-base.out b/qemu/tests/qapi-schema/flat-union-no-base.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-no-base.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-optional-discriminator.err b/qemu/tests/qapi-schema/flat-union-optional-discriminator.err
deleted file mode 100644
index aaabedb3b..000000000
--- a/qemu/tests/qapi-schema/flat-union-optional-discriminator.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-optional-discriminator.json:6: Discriminator of flat union 'MyUnion' does not allow optional name '*switch'
diff --git a/qemu/tests/qapi-schema/flat-union-optional-discriminator.exit b/qemu/tests/qapi-schema/flat-union-optional-discriminator.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-optional-discriminator.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-optional-discriminator.json b/qemu/tests/qapi-schema/flat-union-optional-discriminator.json
deleted file mode 100644
index 08a8f7ef8..000000000
--- a/qemu/tests/qapi-schema/flat-union-optional-discriminator.json
+++ /dev/null
@@ -1,10 +0,0 @@
-# we require the discriminator to be non-optional
-{ 'enum': 'Enum', 'data': [ 'one', 'two' ] }
-{ 'struct': 'Base',
- 'data': { '*switch': 'Enum' } }
-{ 'struct': 'Branch', 'data': { 'name': 'str' } }
-{ 'union': 'MyUnion',
- 'base': 'Base',
- 'discriminator': '*switch',
- 'data': { 'one': 'Branch',
- 'two': 'Branch' } }
diff --git a/qemu/tests/qapi-schema/flat-union-optional-discriminator.out b/qemu/tests/qapi-schema/flat-union-optional-discriminator.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-optional-discriminator.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/flat-union-string-discriminator.err b/qemu/tests/qapi-schema/flat-union-string-discriminator.err
deleted file mode 100644
index 200016bd5..000000000
--- a/qemu/tests/qapi-schema/flat-union-string-discriminator.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/flat-union-string-discriminator.json:13: Discriminator 'kind' must be of enumeration type
diff --git a/qemu/tests/qapi-schema/flat-union-string-discriminator.exit b/qemu/tests/qapi-schema/flat-union-string-discriminator.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/flat-union-string-discriminator.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/flat-union-string-discriminator.json b/qemu/tests/qapi-schema/flat-union-string-discriminator.json
deleted file mode 100644
index 8af60333b..000000000
--- a/qemu/tests/qapi-schema/flat-union-string-discriminator.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-
-{ 'struct': 'TestBase',
- 'data': { 'enum1': 'TestEnum', 'kind': 'str' } }
-
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-
-{ 'union': 'TestUnion',
- 'base': 'TestBase',
- 'discriminator': 'kind',
- 'data': { 'kind1': 'TestTypeA',
- 'kind2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/flat-union-string-discriminator.out b/qemu/tests/qapi-schema/flat-union-string-discriminator.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/flat-union-string-discriminator.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/funny-char.err b/qemu/tests/qapi-schema/funny-char.err
deleted file mode 100644
index bfc890cd9..000000000
--- a/qemu/tests/qapi-schema/funny-char.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/funny-char.json:2:36: Stray ";"
diff --git a/qemu/tests/qapi-schema/funny-char.exit b/qemu/tests/qapi-schema/funny-char.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/funny-char.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/funny-char.json b/qemu/tests/qapi-schema/funny-char.json
deleted file mode 100644
index d4973a2cd..000000000
--- a/qemu/tests/qapi-schema/funny-char.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly' ]; }
diff --git a/qemu/tests/qapi-schema/funny-char.out b/qemu/tests/qapi-schema/funny-char.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/funny-char.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/ident-with-escape.err b/qemu/tests/qapi-schema/ident-with-escape.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/ident-with-escape.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/ident-with-escape.exit b/qemu/tests/qapi-schema/ident-with-escape.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/ident-with-escape.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/ident-with-escape.json b/qemu/tests/qapi-schema/ident-with-escape.json
deleted file mode 100644
index 56617501e..000000000
--- a/qemu/tests/qapi-schema/ident-with-escape.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# we allow escape sequences in strings, if they map back to ASCII
-# { 'command': 'fooA', 'data': { 'bar1': 'str' } }
-{ 'c\u006fmmand': '\u0066\u006f\u006FA',
- 'd\u0061ta': { '\u0062\u0061\u00721': '\u0073\u0074\u0072' } }
diff --git a/qemu/tests/qapi-schema/ident-with-escape.out b/qemu/tests/qapi-schema/ident-with-escape.out
deleted file mode 100644
index 382ce2fa2..000000000
--- a/qemu/tests/qapi-schema/ident-with-escape.out
+++ /dev/null
@@ -1,7 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-command fooA q_obj_fooA-arg -> None
- gen=True success_response=True
-object q_empty
-object q_obj_fooA-arg
- member bar1: str optional=False
diff --git a/qemu/tests/qapi-schema/include-before-err.err b/qemu/tests/qapi-schema/include-before-err.err
deleted file mode 100644
index 55652751e..000000000
--- a/qemu/tests/qapi-schema/include-before-err.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/include-before-err.json:2:13: Expected ":"
diff --git a/qemu/tests/qapi-schema/include-before-err.exit b/qemu/tests/qapi-schema/include-before-err.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-before-err.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-before-err.json b/qemu/tests/qapi-schema/include-before-err.json
deleted file mode 100644
index afb6cb63c..000000000
--- a/qemu/tests/qapi-schema/include-before-err.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'include': 'include-simple-sub.json' }
-{ 'command' 'missing-colon' }
diff --git a/qemu/tests/qapi-schema/include-before-err.out b/qemu/tests/qapi-schema/include-before-err.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-before-err.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-cycle-b.json b/qemu/tests/qapi-schema/include-cycle-b.json
deleted file mode 100644
index 4fa985dcd..000000000
--- a/qemu/tests/qapi-schema/include-cycle-b.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-cycle-c.json' }
diff --git a/qemu/tests/qapi-schema/include-cycle-c.json b/qemu/tests/qapi-schema/include-cycle-c.json
deleted file mode 100644
index d12b5924a..000000000
--- a/qemu/tests/qapi-schema/include-cycle-c.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-cycle.json' }
diff --git a/qemu/tests/qapi-schema/include-cycle.err b/qemu/tests/qapi-schema/include-cycle.err
deleted file mode 100644
index bdcd07dce..000000000
--- a/qemu/tests/qapi-schema/include-cycle.err
+++ /dev/null
@@ -1,3 +0,0 @@
-In file included from tests/qapi-schema/include-cycle.json:1:
-In file included from tests/qapi-schema/include-cycle-b.json:1:
-tests/qapi-schema/include-cycle-c.json:1: Inclusion loop for include-cycle.json
diff --git a/qemu/tests/qapi-schema/include-cycle.exit b/qemu/tests/qapi-schema/include-cycle.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-cycle.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-cycle.json b/qemu/tests/qapi-schema/include-cycle.json
deleted file mode 100644
index 6fcf1ebaa..000000000
--- a/qemu/tests/qapi-schema/include-cycle.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-cycle-b.json' }
diff --git a/qemu/tests/qapi-schema/include-cycle.out b/qemu/tests/qapi-schema/include-cycle.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-cycle.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-format-err.err b/qemu/tests/qapi-schema/include-format-err.err
deleted file mode 100644
index 721ff4ecc..000000000
--- a/qemu/tests/qapi-schema/include-format-err.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/include-format-err.json:1: Invalid 'include' directive
diff --git a/qemu/tests/qapi-schema/include-format-err.exit b/qemu/tests/qapi-schema/include-format-err.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-format-err.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-format-err.json b/qemu/tests/qapi-schema/include-format-err.json
deleted file mode 100644
index 44980f026..000000000
--- a/qemu/tests/qapi-schema/include-format-err.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'include': 'include-simple-sub.json',
- 'foo': 'bar' }
diff --git a/qemu/tests/qapi-schema/include-format-err.out b/qemu/tests/qapi-schema/include-format-err.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-format-err.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-nested-err.err b/qemu/tests/qapi-schema/include-nested-err.err
deleted file mode 100644
index 1b7b22706..000000000
--- a/qemu/tests/qapi-schema/include-nested-err.err
+++ /dev/null
@@ -1,2 +0,0 @@
-In file included from tests/qapi-schema/include-nested-err.json:1:
-tests/qapi-schema/missing-colon.json:1:10: Expected ":"
diff --git a/qemu/tests/qapi-schema/include-nested-err.exit b/qemu/tests/qapi-schema/include-nested-err.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-nested-err.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-nested-err.json b/qemu/tests/qapi-schema/include-nested-err.json
deleted file mode 100644
index 5631e56ea..000000000
--- a/qemu/tests/qapi-schema/include-nested-err.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'missing-colon.json' }
diff --git a/qemu/tests/qapi-schema/include-nested-err.out b/qemu/tests/qapi-schema/include-nested-err.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-nested-err.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-no-file.err b/qemu/tests/qapi-schema/include-no-file.err
deleted file mode 100644
index d5b9b22d8..000000000
--- a/qemu/tests/qapi-schema/include-no-file.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/include-no-file.json:1: No such file or directory: include-no-file-sub.json
diff --git a/qemu/tests/qapi-schema/include-no-file.exit b/qemu/tests/qapi-schema/include-no-file.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-no-file.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-no-file.json b/qemu/tests/qapi-schema/include-no-file.json
deleted file mode 100644
index 9249ebd50..000000000
--- a/qemu/tests/qapi-schema/include-no-file.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-no-file-sub.json' }
diff --git a/qemu/tests/qapi-schema/include-no-file.out b/qemu/tests/qapi-schema/include-no-file.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-no-file.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-non-file.err b/qemu/tests/qapi-schema/include-non-file.err
deleted file mode 100644
index faae1eacf..000000000
--- a/qemu/tests/qapi-schema/include-non-file.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/include-non-file.json:1: Value of 'include' must be a string
diff --git a/qemu/tests/qapi-schema/include-non-file.exit b/qemu/tests/qapi-schema/include-non-file.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-non-file.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-non-file.json b/qemu/tests/qapi-schema/include-non-file.json
deleted file mode 100644
index 4711aa42e..000000000
--- a/qemu/tests/qapi-schema/include-non-file.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': {} }
diff --git a/qemu/tests/qapi-schema/include-non-file.out b/qemu/tests/qapi-schema/include-non-file.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-non-file.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-relpath-sub.json b/qemu/tests/qapi-schema/include-relpath-sub.json
deleted file mode 100644
index 4bd4af416..000000000
--- a/qemu/tests/qapi-schema/include-relpath-sub.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/include-relpath.err b/qemu/tests/qapi-schema/include-relpath.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-relpath.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-relpath.exit b/qemu/tests/qapi-schema/include-relpath.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/include-relpath.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/include-relpath.json b/qemu/tests/qapi-schema/include-relpath.json
deleted file mode 100644
index 05018f390..000000000
--- a/qemu/tests/qapi-schema/include-relpath.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include/relpath.json' }
diff --git a/qemu/tests/qapi-schema/include-relpath.out b/qemu/tests/qapi-schema/include-relpath.out
deleted file mode 100644
index 5d7c13cad..000000000
--- a/qemu/tests/qapi-schema/include-relpath.out
+++ /dev/null
@@ -1,4 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-enum Status ['good', 'bad', 'ugly']
-object q_empty
diff --git a/qemu/tests/qapi-schema/include-repetition-sub.json b/qemu/tests/qapi-schema/include-repetition-sub.json
deleted file mode 100644
index 6bfffdfd5..000000000
--- a/qemu/tests/qapi-schema/include-repetition-sub.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'include': 'comments.json' }
-{ 'include': 'comments.json' }
diff --git a/qemu/tests/qapi-schema/include-repetition.err b/qemu/tests/qapi-schema/include-repetition.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-repetition.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-repetition.exit b/qemu/tests/qapi-schema/include-repetition.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/include-repetition.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/include-repetition.json b/qemu/tests/qapi-schema/include-repetition.json
deleted file mode 100644
index ec329dde5..000000000
--- a/qemu/tests/qapi-schema/include-repetition.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ 'include': 'comments.json' }
-{ 'include': 'include-repetition-sub.json' }
-{ 'include': 'comments.json' }
diff --git a/qemu/tests/qapi-schema/include-repetition.out b/qemu/tests/qapi-schema/include-repetition.out
deleted file mode 100644
index 5d7c13cad..000000000
--- a/qemu/tests/qapi-schema/include-repetition.out
+++ /dev/null
@@ -1,4 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-enum Status ['good', 'bad', 'ugly']
-object q_empty
diff --git a/qemu/tests/qapi-schema/include-self-cycle.err b/qemu/tests/qapi-schema/include-self-cycle.err
deleted file mode 100644
index 981742ae5..000000000
--- a/qemu/tests/qapi-schema/include-self-cycle.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/include-self-cycle.json:1: Inclusion loop for include-self-cycle.json
diff --git a/qemu/tests/qapi-schema/include-self-cycle.exit b/qemu/tests/qapi-schema/include-self-cycle.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/include-self-cycle.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/include-self-cycle.json b/qemu/tests/qapi-schema/include-self-cycle.json
deleted file mode 100644
index 55fb1b596..000000000
--- a/qemu/tests/qapi-schema/include-self-cycle.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-self-cycle.json' }
diff --git a/qemu/tests/qapi-schema/include-self-cycle.out b/qemu/tests/qapi-schema/include-self-cycle.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-self-cycle.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-simple-sub.json b/qemu/tests/qapi-schema/include-simple-sub.json
deleted file mode 100644
index 4bd4af416..000000000
--- a/qemu/tests/qapi-schema/include-simple-sub.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/include-simple.err b/qemu/tests/qapi-schema/include-simple.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/include-simple.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/include-simple.exit b/qemu/tests/qapi-schema/include-simple.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/include-simple.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/include-simple.json b/qemu/tests/qapi-schema/include-simple.json
deleted file mode 100644
index 1dd391a59..000000000
--- a/qemu/tests/qapi-schema/include-simple.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': 'include-simple-sub.json' }
diff --git a/qemu/tests/qapi-schema/include-simple.out b/qemu/tests/qapi-schema/include-simple.out
deleted file mode 100644
index 5d7c13cad..000000000
--- a/qemu/tests/qapi-schema/include-simple.out
+++ /dev/null
@@ -1,4 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-enum Status ['good', 'bad', 'ugly']
-object q_empty
diff --git a/qemu/tests/qapi-schema/include/relpath.json b/qemu/tests/qapi-schema/include/relpath.json
deleted file mode 100644
index 45dee2470..000000000
--- a/qemu/tests/qapi-schema/include/relpath.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'include': '../include-relpath-sub.json' }
diff --git a/qemu/tests/qapi-schema/indented-expr.err b/qemu/tests/qapi-schema/indented-expr.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/indented-expr.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/indented-expr.exit b/qemu/tests/qapi-schema/indented-expr.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/indented-expr.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/indented-expr.json b/qemu/tests/qapi-schema/indented-expr.json
deleted file mode 100644
index 7115d3131..000000000
--- a/qemu/tests/qapi-schema/indented-expr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'command' : 'eins' }
- { 'command' : 'zwei' }
diff --git a/qemu/tests/qapi-schema/indented-expr.out b/qemu/tests/qapi-schema/indented-expr.out
deleted file mode 100644
index ae3293a3a..000000000
--- a/qemu/tests/qapi-schema/indented-expr.out
+++ /dev/null
@@ -1,7 +0,0 @@
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-command eins None -> None
- gen=True success_response=True
-object q_empty
-command zwei None -> None
- gen=True success_response=True
diff --git a/qemu/tests/qapi-schema/leading-comma-list.err b/qemu/tests/qapi-schema/leading-comma-list.err
deleted file mode 100644
index f5c870bb9..000000000
--- a/qemu/tests/qapi-schema/leading-comma-list.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/leading-comma-list.json:2:13: Expected "{", "[", "]", string, boolean or "null"
diff --git a/qemu/tests/qapi-schema/leading-comma-list.exit b/qemu/tests/qapi-schema/leading-comma-list.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/leading-comma-list.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/leading-comma-list.json b/qemu/tests/qapi-schema/leading-comma-list.json
deleted file mode 100644
index c5ba50159..000000000
--- a/qemu/tests/qapi-schema/leading-comma-list.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ , 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/leading-comma-list.out b/qemu/tests/qapi-schema/leading-comma-list.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/leading-comma-list.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/leading-comma-object.err b/qemu/tests/qapi-schema/leading-comma-object.err
deleted file mode 100644
index f767b9554..000000000
--- a/qemu/tests/qapi-schema/leading-comma-object.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/leading-comma-object.json:1:3: Expected string or "}"
diff --git a/qemu/tests/qapi-schema/leading-comma-object.exit b/qemu/tests/qapi-schema/leading-comma-object.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/leading-comma-object.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/leading-comma-object.json b/qemu/tests/qapi-schema/leading-comma-object.json
deleted file mode 100644
index c89023ff3..000000000
--- a/qemu/tests/qapi-schema/leading-comma-object.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ , 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/leading-comma-object.out b/qemu/tests/qapi-schema/leading-comma-object.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/leading-comma-object.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/missing-colon.err b/qemu/tests/qapi-schema/missing-colon.err
deleted file mode 100644
index d9d66b377..000000000
--- a/qemu/tests/qapi-schema/missing-colon.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/missing-colon.json:1:10: Expected ":"
diff --git a/qemu/tests/qapi-schema/missing-colon.exit b/qemu/tests/qapi-schema/missing-colon.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/missing-colon.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/missing-colon.json b/qemu/tests/qapi-schema/missing-colon.json
deleted file mode 100644
index 6fc27ce40..000000000
--- a/qemu/tests/qapi-schema/missing-colon.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum' 'Status',
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/missing-colon.out b/qemu/tests/qapi-schema/missing-colon.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/missing-colon.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/missing-comma-list.err b/qemu/tests/qapi-schema/missing-comma-list.err
deleted file mode 100644
index e73d2770d..000000000
--- a/qemu/tests/qapi-schema/missing-comma-list.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/missing-comma-list.json:2:20: Expected "," or "]"
diff --git a/qemu/tests/qapi-schema/missing-comma-list.exit b/qemu/tests/qapi-schema/missing-comma-list.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/missing-comma-list.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/missing-comma-list.json b/qemu/tests/qapi-schema/missing-comma-list.json
deleted file mode 100644
index 1af39b293..000000000
--- a/qemu/tests/qapi-schema/missing-comma-list.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good' 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/missing-comma-list.out b/qemu/tests/qapi-schema/missing-comma-list.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/missing-comma-list.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/missing-comma-object.err b/qemu/tests/qapi-schema/missing-comma-object.err
deleted file mode 100644
index 52b3a8a1e..000000000
--- a/qemu/tests/qapi-schema/missing-comma-object.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/missing-comma-object.json:2:3: Expected "," or "}"
diff --git a/qemu/tests/qapi-schema/missing-comma-object.exit b/qemu/tests/qapi-schema/missing-comma-object.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/missing-comma-object.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/missing-comma-object.json b/qemu/tests/qapi-schema/missing-comma-object.json
deleted file mode 100644
index 50f51786e..000000000
--- a/qemu/tests/qapi-schema/missing-comma-object.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status'
- 'data': [ 'good', 'bad', 'ugly' ] }
diff --git a/qemu/tests/qapi-schema/missing-comma-object.out b/qemu/tests/qapi-schema/missing-comma-object.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/missing-comma-object.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/missing-type.err b/qemu/tests/qapi-schema/missing-type.err
deleted file mode 100644
index b3e7b14e4..000000000
--- a/qemu/tests/qapi-schema/missing-type.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/missing-type.json:2: Expression is missing metatype
diff --git a/qemu/tests/qapi-schema/missing-type.exit b/qemu/tests/qapi-schema/missing-type.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/missing-type.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/missing-type.json b/qemu/tests/qapi-schema/missing-type.json
deleted file mode 100644
index ff5349d3f..000000000
--- a/qemu/tests/qapi-schema/missing-type.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with missing metatype
-{ 'data': { } }
diff --git a/qemu/tests/qapi-schema/missing-type.out b/qemu/tests/qapi-schema/missing-type.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/missing-type.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/nested-struct-data.err b/qemu/tests/qapi-schema/nested-struct-data.err
deleted file mode 100644
index da767bade..000000000
--- a/qemu/tests/qapi-schema/nested-struct-data.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/nested-struct-data.json:2: Member 'a' of 'data' for command 'foo' should be a type name
diff --git a/qemu/tests/qapi-schema/nested-struct-data.exit b/qemu/tests/qapi-schema/nested-struct-data.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/nested-struct-data.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/nested-struct-data.json b/qemu/tests/qapi-schema/nested-struct-data.json
deleted file mode 100644
index efbe773de..000000000
--- a/qemu/tests/qapi-schema/nested-struct-data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# inline subtypes collide with our desired future use of defaults
-{ 'command': 'foo',
- 'data': { 'a' : { 'string' : 'str', 'integer': 'int' }, 'b' : 'str' } }
diff --git a/qemu/tests/qapi-schema/nested-struct-data.out b/qemu/tests/qapi-schema/nested-struct-data.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/nested-struct-data.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/non-objects.err b/qemu/tests/qapi-schema/non-objects.err
deleted file mode 100644
index 334f0c91a..000000000
--- a/qemu/tests/qapi-schema/non-objects.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/non-objects.json:1:1: Expected "{"
diff --git a/qemu/tests/qapi-schema/non-objects.exit b/qemu/tests/qapi-schema/non-objects.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/non-objects.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/non-objects.json b/qemu/tests/qapi-schema/non-objects.json
deleted file mode 100644
index f3fa851d4..000000000
--- a/qemu/tests/qapi-schema/non-objects.json
+++ /dev/null
@@ -1,2 +0,0 @@
-'string'
-[ ]
diff --git a/qemu/tests/qapi-schema/non-objects.out b/qemu/tests/qapi-schema/non-objects.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/non-objects.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/qapi-schema-test.err b/qemu/tests/qapi-schema/qapi-schema-test.err
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/qapi-schema-test.err
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/qapi-schema-test.exit b/qemu/tests/qapi-schema/qapi-schema-test.exit
deleted file mode 100644
index 573541ac9..000000000
--- a/qemu/tests/qapi-schema/qapi-schema-test.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/qemu/tests/qapi-schema/qapi-schema-test.json b/qemu/tests/qapi-schema/qapi-schema-test.json
deleted file mode 100644
index f571e1bb3..000000000
--- a/qemu/tests/qapi-schema/qapi-schema-test.json
+++ /dev/null
@@ -1,177 +0,0 @@
-# *-*- Mode: Python -*-*
-
-# This file is a stress test of supported qapi constructs that must
-# parse and compile correctly.
-
-{ 'struct': 'TestStruct',
- 'data': { 'integer': 'int', 'boolean': 'bool', 'string': 'str' } }
-
-# for testing enums
-{ 'struct': 'NestedEnumsOne',
- 'data': { 'enum1': 'EnumOne', # Intentional forward reference
- '*enum2': 'EnumOne', 'enum3': 'EnumOne', '*enum4': 'EnumOne' } }
-
-# An empty enum, although unusual, is currently acceptable
-{ 'enum': 'MyEnum', 'data': [ ] }
-
-# Likewise for an empty struct, including an empty base
-{ 'struct': 'Empty1', 'data': { } }
-{ 'struct': 'Empty2', 'base': 'Empty1', 'data': { } }
-
-{ 'command': 'user_def_cmd0', 'data': 'Empty2', 'returns': 'Empty2' }
-
-# for testing override of default naming heuristic
-{ 'enum': 'QEnumTwo',
- 'prefix': 'QENUM_TWO',
- 'data': [ 'value1', 'value2' ] }
-
-# for testing nested structs
-{ 'struct': 'UserDefOne',
- 'base': 'UserDefZero', # intentional forward reference
- 'data': { 'string': 'str',
- '*enum1': 'EnumOne' } } # intentional forward reference
-
-{ 'enum': 'EnumOne',
- 'data': [ 'value1', 'value2', 'value3' ] }
-
-{ 'struct': 'UserDefZero',
- 'data': { 'integer': 'int' } }
-
-{ 'struct': 'UserDefTwoDictDict',
- 'data': { 'userdef': 'UserDefOne', 'string': 'str' } }
-
-{ 'struct': 'UserDefTwoDict',
- 'data': { 'string1': 'str',
- 'dict2': 'UserDefTwoDictDict',
- '*dict3': 'UserDefTwoDictDict' } }
-
-{ 'struct': 'UserDefTwo',
- 'data': { 'string0': 'str',
- 'dict1': 'UserDefTwoDict' } }
-
-# dummy struct to force generation of array types not otherwise mentioned
-{ 'struct': 'ForceArrays',
- 'data': { 'unused1':['UserDefOne'], 'unused2':['UserDefTwo'],
- 'unused3':['TestStruct'] } }
-
-# for testing unions
-# Among other things, test that a name collision between branches does
-# not cause any problems (since only one branch can be in use at a time),
-# by intentionally using two branches that both have a C member 'a_b'
-{ 'struct': 'UserDefA',
- 'data': { 'boolean': 'bool', '*a_b': 'int' } }
-
-{ 'struct': 'UserDefB',
- 'data': { 'intb': 'int', '*a-b': 'bool' } }
-
-{ 'union': 'UserDefFlatUnion',
- 'base': 'UserDefUnionBase', # intentional forward reference
- 'discriminator': 'enum1',
- 'data': { 'value1' : 'UserDefA',
- 'value2' : 'UserDefB',
- 'value3' : 'UserDefB' } }
-
-{ 'struct': 'UserDefUnionBase',
- 'base': 'UserDefZero',
- 'data': { 'string': 'str', 'enum1': 'EnumOne' } }
-
-# this variant of UserDefFlatUnion defaults to a union that uses members with
-# allocated types to test corner cases in the cleanup/dealloc visitor
-{ 'union': 'UserDefFlatUnion2',
- 'base': { '*integer': 'int', 'string': 'str', 'enum1': 'QEnumTwo' },
- 'discriminator': 'enum1',
- 'data': { 'value1' : 'UserDefC', # intentional forward reference
- 'value2' : 'UserDefB' } }
-
-{ 'struct': 'WrapAlternate',
- 'data': { 'alt': 'UserDefAlternate' } }
-{ 'alternate': 'UserDefAlternate',
- 'data': { 'udfu': 'UserDefFlatUnion', 's': 'str', 'i': 'int' } }
-
-{ 'struct': 'UserDefC',
- 'data': { 'string1': 'str', 'string2': 'str' } }
-
-# for testing use of 'number' within alternates
-{ 'alternate': 'AltStrBool', 'data': { 's': 'str', 'b': 'bool' } }
-{ 'alternate': 'AltStrNum', 'data': { 's': 'str', 'n': 'number' } }
-{ 'alternate': 'AltNumStr', 'data': { 'n': 'number', 's': 'str' } }
-{ 'alternate': 'AltStrInt', 'data': { 's': 'str', 'i': 'int' } }
-{ 'alternate': 'AltIntNum', 'data': { 'i': 'int', 'n': 'number' } }
-{ 'alternate': 'AltNumInt', 'data': { 'n': 'number', 'i': 'int' } }
-
-# for testing native lists
-{ 'union': 'UserDefNativeListUnion',
- 'data': { 'integer': ['int'],
- 's8': ['int8'],
- 's16': ['int16'],
- 's32': ['int32'],
- 's64': ['int64'],
- 'u8': ['uint8'],
- 'u16': ['uint16'],
- 'u32': ['uint32'],
- 'u64': ['uint64'],
- 'number': ['number'],
- 'boolean': ['bool'],
- 'string': ['str'],
- 'sizes': ['size'],
- 'any': ['any'] } }
-
-# testing commands
-{ 'command': 'user_def_cmd', 'data': {} }
-{ 'command': 'user_def_cmd1', 'data': {'ud1a': 'UserDefOne'} }
-{ 'command': 'user_def_cmd2',
- 'data': {'ud1a': 'UserDefOne', '*ud1b': 'UserDefOne'},
- 'returns': 'UserDefTwo' }
-
-# Returning a non-dictionary requires a name from the whitelist
-{ 'command': 'guest-get-time', 'data': {'a': 'int', '*b': 'int' },
- 'returns': 'int' }
-{ 'command': 'guest-sync', 'data': { 'arg': 'any' }, 'returns': 'any' }
-
-# For testing integer range flattening in opts-visitor. The following schema
-# corresponds to the option format:
-#
-# -userdef i64=3-6,i64=-5--1,u64=2,u16=1,u16=7-12
-#
-# For simplicity, this example doesn't use [type=]discriminator nor optargs
-# specific to discriminator values.
-{ 'struct': 'UserDefOptions',
- 'data': {
- '*i64' : [ 'int' ],
- '*u64' : [ 'uint64' ],
- '*u16' : [ 'uint16' ],
- '*i64x': 'int' ,
- '*u64x': 'uint64' } }
-
-# testing event
-{ 'struct': 'EventStructOne',
- 'data': { 'struct1': 'UserDefOne', 'string': 'str', '*enum2': 'EnumOne' } }
-
-{ 'event': 'EVENT_A' }
-{ 'event': 'EVENT_B',
- 'data': { } }
-{ 'event': 'EVENT_C',
- 'data': { '*a': 'int', '*b': 'UserDefOne', 'c': 'str' } }
-{ 'event': 'EVENT_D',
- 'data': { 'a' : 'EventStructOne', 'b' : 'str', '*c': 'str', '*enum3': 'EnumOne' } }
-
-# test that we correctly compile downstream extensions, as well as munge
-# ticklish names
-{ 'enum': '__org.qemu_x-Enum', 'data': [ '__org.qemu_x-value' ] }
-{ 'struct': '__org.qemu_x-Base',
- 'data': { '__org.qemu_x-member1': '__org.qemu_x-Enum' } }
-{ 'struct': '__org.qemu_x-Struct', 'base': '__org.qemu_x-Base',
- 'data': { '__org.qemu_x-member2': 'str', '*wchar-t': 'int' } }
-{ 'union': '__org.qemu_x-Union1', 'data': { '__org.qemu_x-branch': 'str' } }
-{ 'struct': '__org.qemu_x-Struct2',
- 'data': { 'array': ['__org.qemu_x-Union1'] } }
-{ 'union': '__org.qemu_x-Union2', 'base': '__org.qemu_x-Base',
- 'discriminator': '__org.qemu_x-member1',
- 'data': { '__org.qemu_x-value': '__org.qemu_x-Struct2' } }
-{ 'alternate': '__org.qemu_x-Alt',
- 'data': { '__org.qemu_x-branch': 'str', 'b': '__org.qemu_x-Base' } }
-{ 'event': '__ORG.QEMU_X-EVENT', 'data': '__org.qemu_x-Struct' }
-{ 'command': '__org.qemu_x-command',
- 'data': { 'a': ['__org.qemu_x-Enum'], 'b': ['__org.qemu_x-Struct'],
- 'c': '__org.qemu_x-Union2', 'd': '__org.qemu_x-Alt' },
- 'returns': '__org.qemu_x-Union1' }
diff --git a/qemu/tests/qapi-schema/qapi-schema-test.out b/qemu/tests/qapi-schema/qapi-schema-test.out
deleted file mode 100644
index 19cd214f6..000000000
--- a/qemu/tests/qapi-schema/qapi-schema-test.out
+++ /dev/null
@@ -1,211 +0,0 @@
-alternate AltIntNum
- case i: int
- case n: number
-alternate AltNumInt
- case n: number
- case i: int
-alternate AltNumStr
- case n: number
- case s: str
-alternate AltStrBool
- case s: str
- case b: bool
-alternate AltStrInt
- case s: str
- case i: int
-alternate AltStrNum
- case s: str
- case n: number
-event EVENT_A None
-event EVENT_B None
-event EVENT_C q_obj_EVENT_C-arg
-event EVENT_D q_obj_EVENT_D-arg
-object Empty1
-object Empty2
- base Empty1
-enum EnumOne ['value1', 'value2', 'value3']
-object EventStructOne
- member struct1: UserDefOne optional=False
- member string: str optional=False
- member enum2: EnumOne optional=True
-object ForceArrays
- member unused1: UserDefOneList optional=False
- member unused2: UserDefTwoList optional=False
- member unused3: TestStructList optional=False
-enum MyEnum []
-object NestedEnumsOne
- member enum1: EnumOne optional=False
- member enum2: EnumOne optional=True
- member enum3: EnumOne optional=False
- member enum4: EnumOne optional=True
-enum QEnumTwo ['value1', 'value2']
- prefix QENUM_TWO
-enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
- prefix QTYPE
-object TestStruct
- member integer: int optional=False
- member boolean: bool optional=False
- member string: str optional=False
-object UserDefA
- member boolean: bool optional=False
- member a_b: int optional=True
-alternate UserDefAlternate
- case udfu: UserDefFlatUnion
- case s: str
- case i: int
-object UserDefB
- member intb: int optional=False
- member a-b: bool optional=True
-object UserDefC
- member string1: str optional=False
- member string2: str optional=False
-object UserDefFlatUnion
- base UserDefUnionBase
- tag enum1
- case value1: UserDefA
- case value2: UserDefB
- case value3: UserDefB
-object UserDefFlatUnion2
- base q_obj_UserDefFlatUnion2-base
- tag enum1
- case value1: UserDefC
- case value2: UserDefB
-object UserDefNativeListUnion
- member type: UserDefNativeListUnionKind optional=False
- case integer: q_obj_intList-wrapper
- case s8: q_obj_int8List-wrapper
- case s16: q_obj_int16List-wrapper
- case s32: q_obj_int32List-wrapper
- case s64: q_obj_int64List-wrapper
- case u8: q_obj_uint8List-wrapper
- case u16: q_obj_uint16List-wrapper
- case u32: q_obj_uint32List-wrapper
- case u64: q_obj_uint64List-wrapper
- case number: q_obj_numberList-wrapper
- case boolean: q_obj_boolList-wrapper
- case string: q_obj_strList-wrapper
- case sizes: q_obj_sizeList-wrapper
- case any: q_obj_anyList-wrapper
-enum UserDefNativeListUnionKind ['integer', 's8', 's16', 's32', 's64', 'u8', 'u16', 'u32', 'u64', 'number', 'boolean', 'string', 'sizes', 'any']
-object UserDefOne
- base UserDefZero
- member string: str optional=False
- member enum1: EnumOne optional=True
-object UserDefOptions
- member i64: intList optional=True
- member u64: uint64List optional=True
- member u16: uint16List optional=True
- member i64x: int optional=True
- member u64x: uint64 optional=True
-object UserDefTwo
- member string0: str optional=False
- member dict1: UserDefTwoDict optional=False
-object UserDefTwoDict
- member string1: str optional=False
- member dict2: UserDefTwoDictDict optional=False
- member dict3: UserDefTwoDictDict optional=True
-object UserDefTwoDictDict
- member userdef: UserDefOne optional=False
- member string: str optional=False
-object UserDefUnionBase
- base UserDefZero
- member string: str optional=False
- member enum1: EnumOne optional=False
-object UserDefZero
- member integer: int optional=False
-object WrapAlternate
- member alt: UserDefAlternate optional=False
-event __ORG.QEMU_X-EVENT __org.qemu_x-Struct
-alternate __org.qemu_x-Alt
- case __org.qemu_x-branch: str
- case b: __org.qemu_x-Base
-object __org.qemu_x-Base
- member __org.qemu_x-member1: __org.qemu_x-Enum optional=False
-enum __org.qemu_x-Enum ['__org.qemu_x-value']
-object __org.qemu_x-Struct
- base __org.qemu_x-Base
- member __org.qemu_x-member2: str optional=False
- member wchar-t: int optional=True
-object __org.qemu_x-Struct2
- member array: __org.qemu_x-Union1List optional=False
-object __org.qemu_x-Union1
- member type: __org.qemu_x-Union1Kind optional=False
- case __org.qemu_x-branch: q_obj_str-wrapper
-enum __org.qemu_x-Union1Kind ['__org.qemu_x-branch']
-object __org.qemu_x-Union2
- base __org.qemu_x-Base
- tag __org.qemu_x-member1
- case __org.qemu_x-value: __org.qemu_x-Struct2
-command __org.qemu_x-command q_obj___org.qemu_x-command-arg -> __org.qemu_x-Union1
- gen=True success_response=True
-command guest-get-time q_obj_guest-get-time-arg -> int
- gen=True success_response=True
-command guest-sync q_obj_guest-sync-arg -> any
- gen=True success_response=True
-object q_empty
-object q_obj_EVENT_C-arg
- member a: int optional=True
- member b: UserDefOne optional=True
- member c: str optional=False
-object q_obj_EVENT_D-arg
- member a: EventStructOne optional=False
- member b: str optional=False
- member c: str optional=True
- member enum3: EnumOne optional=True
-object q_obj_UserDefFlatUnion2-base
- member integer: int optional=True
- member string: str optional=False
- member enum1: QEnumTwo optional=False
-object q_obj___org.qemu_x-command-arg
- member a: __org.qemu_x-EnumList optional=False
- member b: __org.qemu_x-StructList optional=False
- member c: __org.qemu_x-Union2 optional=False
- member d: __org.qemu_x-Alt optional=False
-object q_obj_anyList-wrapper
- member data: anyList optional=False
-object q_obj_boolList-wrapper
- member data: boolList optional=False
-object q_obj_guest-get-time-arg
- member a: int optional=False
- member b: int optional=True
-object q_obj_guest-sync-arg
- member arg: any optional=False
-object q_obj_int16List-wrapper
- member data: int16List optional=False
-object q_obj_int32List-wrapper
- member data: int32List optional=False
-object q_obj_int64List-wrapper
- member data: int64List optional=False
-object q_obj_int8List-wrapper
- member data: int8List optional=False
-object q_obj_intList-wrapper
- member data: intList optional=False
-object q_obj_numberList-wrapper
- member data: numberList optional=False
-object q_obj_sizeList-wrapper
- member data: sizeList optional=False
-object q_obj_str-wrapper
- member data: str optional=False
-object q_obj_strList-wrapper
- member data: strList optional=False
-object q_obj_uint16List-wrapper
- member data: uint16List optional=False
-object q_obj_uint32List-wrapper
- member data: uint32List optional=False
-object q_obj_uint64List-wrapper
- member data: uint64List optional=False
-object q_obj_uint8List-wrapper
- member data: uint8List optional=False
-object q_obj_user_def_cmd1-arg
- member ud1a: UserDefOne optional=False
-object q_obj_user_def_cmd2-arg
- member ud1a: UserDefOne optional=False
- member ud1b: UserDefOne optional=True
-command user_def_cmd None -> None
- gen=True success_response=True
-command user_def_cmd0 Empty2 -> Empty2
- gen=True success_response=True
-command user_def_cmd1 q_obj_user_def_cmd1-arg -> None
- gen=True success_response=True
-command user_def_cmd2 q_obj_user_def_cmd2-arg -> UserDefTwo
- gen=True success_response=True
diff --git a/qemu/tests/qapi-schema/quoted-structural-chars.err b/qemu/tests/qapi-schema/quoted-structural-chars.err
deleted file mode 100644
index 9b183841d..000000000
--- a/qemu/tests/qapi-schema/quoted-structural-chars.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/quoted-structural-chars.json:1:1: Expected "{"
diff --git a/qemu/tests/qapi-schema/quoted-structural-chars.exit b/qemu/tests/qapi-schema/quoted-structural-chars.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/quoted-structural-chars.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/quoted-structural-chars.json b/qemu/tests/qapi-schema/quoted-structural-chars.json
deleted file mode 100644
index 9fe657ae9..000000000
--- a/qemu/tests/qapi-schema/quoted-structural-chars.json
+++ /dev/null
@@ -1 +0,0 @@
-'{' 'key1' ':' 'value1' ',' 'key2' ':' '[' ']' '}'
diff --git a/qemu/tests/qapi-schema/quoted-structural-chars.out b/qemu/tests/qapi-schema/quoted-structural-chars.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/quoted-structural-chars.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/redefined-builtin.err b/qemu/tests/qapi-schema/redefined-builtin.err
deleted file mode 100644
index b2757225c..000000000
--- a/qemu/tests/qapi-schema/redefined-builtin.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/redefined-builtin.json:2: built-in 'size' is already defined
diff --git a/qemu/tests/qapi-schema/redefined-builtin.exit b/qemu/tests/qapi-schema/redefined-builtin.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/redefined-builtin.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/redefined-builtin.json b/qemu/tests/qapi-schema/redefined-builtin.json
deleted file mode 100644
index 45b8a550a..000000000
--- a/qemu/tests/qapi-schema/redefined-builtin.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject types that duplicate builtin names
-{ 'struct': 'size', 'data': { 'myint': 'size' } }
diff --git a/qemu/tests/qapi-schema/redefined-builtin.out b/qemu/tests/qapi-schema/redefined-builtin.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/redefined-builtin.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/redefined-command.err b/qemu/tests/qapi-schema/redefined-command.err
deleted file mode 100644
index 82ae256e6..000000000
--- a/qemu/tests/qapi-schema/redefined-command.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/redefined-command.json:3: command 'foo' is already defined
diff --git a/qemu/tests/qapi-schema/redefined-command.exit b/qemu/tests/qapi-schema/redefined-command.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/redefined-command.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/redefined-command.json b/qemu/tests/qapi-schema/redefined-command.json
deleted file mode 100644
index 247e40194..000000000
--- a/qemu/tests/qapi-schema/redefined-command.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject commands defined more than once
-{ 'command': 'foo', 'data': { 'one': 'str' } }
-{ 'command': 'foo', 'data': { '*two': 'str' } }
diff --git a/qemu/tests/qapi-schema/redefined-command.out b/qemu/tests/qapi-schema/redefined-command.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/redefined-command.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/redefined-event.err b/qemu/tests/qapi-schema/redefined-event.err
deleted file mode 100644
index 35429cb48..000000000
--- a/qemu/tests/qapi-schema/redefined-event.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/redefined-event.json:3: event 'EVENT_A' is already defined
diff --git a/qemu/tests/qapi-schema/redefined-event.exit b/qemu/tests/qapi-schema/redefined-event.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/redefined-event.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/redefined-event.json b/qemu/tests/qapi-schema/redefined-event.json
deleted file mode 100644
index 7717e91c1..000000000
--- a/qemu/tests/qapi-schema/redefined-event.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject duplicate events
-{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } }
-{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } }
diff --git a/qemu/tests/qapi-schema/redefined-event.out b/qemu/tests/qapi-schema/redefined-event.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/redefined-event.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/redefined-type.err b/qemu/tests/qapi-schema/redefined-type.err
deleted file mode 100644
index 06ea78c47..000000000
--- a/qemu/tests/qapi-schema/redefined-type.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/redefined-type.json:3: struct 'foo' is already defined
diff --git a/qemu/tests/qapi-schema/redefined-type.exit b/qemu/tests/qapi-schema/redefined-type.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/redefined-type.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/redefined-type.json b/qemu/tests/qapi-schema/redefined-type.json
deleted file mode 100644
index a09e768ba..000000000
--- a/qemu/tests/qapi-schema/redefined-type.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject types defined more than once
-{ 'struct': 'foo', 'data': { 'one': 'str' } }
-{ 'enum': 'foo', 'data': [ 'two' ] }
diff --git a/qemu/tests/qapi-schema/redefined-type.out b/qemu/tests/qapi-schema/redefined-type.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/redefined-type.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-command-q.err b/qemu/tests/qapi-schema/reserved-command-q.err
deleted file mode 100644
index f939e044e..000000000
--- a/qemu/tests/qapi-schema/reserved-command-q.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-command-q.json:5: 'command' uses invalid name 'q-unix'
diff --git a/qemu/tests/qapi-schema/reserved-command-q.exit b/qemu/tests/qapi-schema/reserved-command-q.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-command-q.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-command-q.json b/qemu/tests/qapi-schema/reserved-command-q.json
deleted file mode 100644
index 99f8aae31..000000000
--- a/qemu/tests/qapi-schema/reserved-command-q.json
+++ /dev/null
@@ -1,5 +0,0 @@
-# C entity name collision
-# We reject names like 'q-unix', because they can collide with the mangled
-# name for 'unix' in generated C.
-{ 'command': 'unix' }
-{ 'command': 'q-unix' }
diff --git a/qemu/tests/qapi-schema/reserved-command-q.out b/qemu/tests/qapi-schema/reserved-command-q.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-command-q.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-enum-q.err b/qemu/tests/qapi-schema/reserved-enum-q.err
deleted file mode 100644
index e1c3480ee..000000000
--- a/qemu/tests/qapi-schema/reserved-enum-q.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-enum-q.json:4: Member of enum 'Foo' uses invalid name 'q-Unix'
diff --git a/qemu/tests/qapi-schema/reserved-enum-q.exit b/qemu/tests/qapi-schema/reserved-enum-q.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-enum-q.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-enum-q.json b/qemu/tests/qapi-schema/reserved-enum-q.json
deleted file mode 100644
index 3593a765e..000000000
--- a/qemu/tests/qapi-schema/reserved-enum-q.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# C entity name collision
-# We reject names like 'q-unix', because they can collide with the mangled
-# name for 'unix' in generated C.
-{ 'enum': 'Foo', 'data': [ 'unix', 'q-Unix' ] }
diff --git a/qemu/tests/qapi-schema/reserved-enum-q.out b/qemu/tests/qapi-schema/reserved-enum-q.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-enum-q.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-member-has.err b/qemu/tests/qapi-schema/reserved-member-has.err
deleted file mode 100644
index e75577144..000000000
--- a/qemu/tests/qapi-schema/reserved-member-has.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-member-has.json:5: Member of 'data' for command 'oops' uses reserved name 'has-a'
diff --git a/qemu/tests/qapi-schema/reserved-member-has.exit b/qemu/tests/qapi-schema/reserved-member-has.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-member-has.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-member-has.json b/qemu/tests/qapi-schema/reserved-member-has.json
deleted file mode 100644
index 45b9109bd..000000000
--- a/qemu/tests/qapi-schema/reserved-member-has.json
+++ /dev/null
@@ -1,5 +0,0 @@
-# C member name collision
-# We reject names like 'has-a', because they can collide with the flag
-# for an optional 'a' in generated C.
-# TODO we could munge the optional flag name to avoid the collision.
-{ 'command': 'oops', 'data': { '*a': 'str', 'has-a': 'str' } }
diff --git a/qemu/tests/qapi-schema/reserved-member-has.out b/qemu/tests/qapi-schema/reserved-member-has.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-member-has.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-member-q.err b/qemu/tests/qapi-schema/reserved-member-q.err
deleted file mode 100644
index f3d5dd781..000000000
--- a/qemu/tests/qapi-schema/reserved-member-q.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-member-q.json:4: Member of 'data' for struct 'Foo' uses invalid name 'q-unix'
diff --git a/qemu/tests/qapi-schema/reserved-member-q.exit b/qemu/tests/qapi-schema/reserved-member-q.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-member-q.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-member-q.json b/qemu/tests/qapi-schema/reserved-member-q.json
deleted file mode 100644
index 62fed8fdd..000000000
--- a/qemu/tests/qapi-schema/reserved-member-q.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# C member name collision
-# We reject names like 'q-unix', because they can collide with the mangled
-# name for 'unix' in generated C.
-{ 'struct': 'Foo', 'data': { 'unix':'int', 'q-unix':'bool' } }
diff --git a/qemu/tests/qapi-schema/reserved-member-q.out b/qemu/tests/qapi-schema/reserved-member-q.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-member-q.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-member-u.err b/qemu/tests/qapi-schema/reserved-member-u.err
deleted file mode 100644
index 87d42296c..000000000
--- a/qemu/tests/qapi-schema/reserved-member-u.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-member-u.json:7: Member of 'data' for struct 'Oops' uses reserved name 'u'
diff --git a/qemu/tests/qapi-schema/reserved-member-u.exit b/qemu/tests/qapi-schema/reserved-member-u.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-member-u.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-member-u.json b/qemu/tests/qapi-schema/reserved-member-u.json
deleted file mode 100644
index 1eaf0f301..000000000
--- a/qemu/tests/qapi-schema/reserved-member-u.json
+++ /dev/null
@@ -1,7 +0,0 @@
-# Potential C member name collision
-# We reject use of 'u' as a member name, to allow it for internal use in
-# putting union branch members in a separate namespace from QMP members.
-# This is true even for non-unions, because it is possible to convert a
-# struct to flat union while remaining backwards compatible in QMP.
-# TODO - we could munge the member name to 'q_u' to avoid the collision
-{ 'struct': 'Oops', 'data': { 'u': 'str' } }
diff --git a/qemu/tests/qapi-schema/reserved-member-u.out b/qemu/tests/qapi-schema/reserved-member-u.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-member-u.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-member-underscore.err b/qemu/tests/qapi-schema/reserved-member-underscore.err
deleted file mode 100644
index 65ff0da8c..000000000
--- a/qemu/tests/qapi-schema/reserved-member-underscore.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-member-underscore.json:4: Member of 'data' for struct 'Oops' uses invalid name '_oops'
diff --git a/qemu/tests/qapi-schema/reserved-member-underscore.exit b/qemu/tests/qapi-schema/reserved-member-underscore.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-member-underscore.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-member-underscore.json b/qemu/tests/qapi-schema/reserved-member-underscore.json
deleted file mode 100644
index 4a3a01763..000000000
--- a/qemu/tests/qapi-schema/reserved-member-underscore.json
+++ /dev/null
@@ -1,4 +0,0 @@
-# C member name collision
-# We reject use of a single leading underscore in all names (names must
-# begin with a letter or a downstream extension double-underscore prefix).
-{ 'struct': 'Oops', 'data': { '_oops': 'str' } }
diff --git a/qemu/tests/qapi-schema/reserved-member-underscore.out b/qemu/tests/qapi-schema/reserved-member-underscore.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-member-underscore.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-type-kind.err b/qemu/tests/qapi-schema/reserved-type-kind.err
deleted file mode 100644
index 0a38efaad..000000000
--- a/qemu/tests/qapi-schema/reserved-type-kind.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-type-kind.json:2: enum 'UnionKind' should not end in 'Kind'
diff --git a/qemu/tests/qapi-schema/reserved-type-kind.exit b/qemu/tests/qapi-schema/reserved-type-kind.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-type-kind.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-type-kind.json b/qemu/tests/qapi-schema/reserved-type-kind.json
deleted file mode 100644
index 9ecaba12b..000000000
--- a/qemu/tests/qapi-schema/reserved-type-kind.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject types that would conflict with implicit union enum
-{ 'enum': 'UnionKind', 'data': [ 'oops' ] }
diff --git a/qemu/tests/qapi-schema/reserved-type-kind.out b/qemu/tests/qapi-schema/reserved-type-kind.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-type-kind.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/reserved-type-list.err b/qemu/tests/qapi-schema/reserved-type-list.err
deleted file mode 100644
index 4510fa6d9..000000000
--- a/qemu/tests/qapi-schema/reserved-type-list.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/reserved-type-list.json:5: struct 'FooList' should not end in 'List'
diff --git a/qemu/tests/qapi-schema/reserved-type-list.exit b/qemu/tests/qapi-schema/reserved-type-list.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/reserved-type-list.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/reserved-type-list.json b/qemu/tests/qapi-schema/reserved-type-list.json
deleted file mode 100644
index 98d53bf80..000000000
--- a/qemu/tests/qapi-schema/reserved-type-list.json
+++ /dev/null
@@ -1,5 +0,0 @@
-# Potential C name collision
-# We reserve names ending in 'List' for use by array types.
-# TODO - we could choose array names to avoid collision with user types,
-# in order to let this compile
-{ 'struct': 'FooList', 'data': { 's': 'str' } }
diff --git a/qemu/tests/qapi-schema/reserved-type-list.out b/qemu/tests/qapi-schema/reserved-type-list.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/reserved-type-list.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/returns-alternate.err b/qemu/tests/qapi-schema/returns-alternate.err
deleted file mode 100644
index dfbb419ca..000000000
--- a/qemu/tests/qapi-schema/returns-alternate.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/returns-alternate.json:3: 'returns' for command 'oops' cannot use alternate type 'Alt'
diff --git a/qemu/tests/qapi-schema/returns-alternate.exit b/qemu/tests/qapi-schema/returns-alternate.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/returns-alternate.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/returns-alternate.json b/qemu/tests/qapi-schema/returns-alternate.json
deleted file mode 100644
index 972390c06..000000000
--- a/qemu/tests/qapi-schema/returns-alternate.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject returns if it is an alternate type
-{ 'alternate': 'Alt', 'data': { 'a': 'int', 'b': 'str' } }
-{ 'command': 'oops', 'returns': 'Alt' }
diff --git a/qemu/tests/qapi-schema/returns-alternate.out b/qemu/tests/qapi-schema/returns-alternate.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/returns-alternate.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/returns-array-bad.err b/qemu/tests/qapi-schema/returns-array-bad.err
deleted file mode 100644
index 138095ccd..000000000
--- a/qemu/tests/qapi-schema/returns-array-bad.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/returns-array-bad.json:2: 'returns' for command 'oops': array type must contain single type name
diff --git a/qemu/tests/qapi-schema/returns-array-bad.exit b/qemu/tests/qapi-schema/returns-array-bad.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/returns-array-bad.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/returns-array-bad.json b/qemu/tests/qapi-schema/returns-array-bad.json
deleted file mode 100644
index 09b0b1f18..000000000
--- a/qemu/tests/qapi-schema/returns-array-bad.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an array return that is not a single type
-{ 'command': 'oops', 'returns': [ 'str', 'str' ] }
diff --git a/qemu/tests/qapi-schema/returns-array-bad.out b/qemu/tests/qapi-schema/returns-array-bad.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/returns-array-bad.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/returns-dict.err b/qemu/tests/qapi-schema/returns-dict.err
deleted file mode 100644
index eb2d0c466..000000000
--- a/qemu/tests/qapi-schema/returns-dict.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/returns-dict.json:2: 'returns' for command 'oops' should be a type name
diff --git a/qemu/tests/qapi-schema/returns-dict.exit b/qemu/tests/qapi-schema/returns-dict.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/returns-dict.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/returns-dict.json b/qemu/tests/qapi-schema/returns-dict.json
deleted file mode 100644
index 1cfef3ede..000000000
--- a/qemu/tests/qapi-schema/returns-dict.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject inline struct return type
-{ 'command': 'oops', 'returns': { 'a': 'str' } }
diff --git a/qemu/tests/qapi-schema/returns-dict.out b/qemu/tests/qapi-schema/returns-dict.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/returns-dict.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/returns-unknown.err b/qemu/tests/qapi-schema/returns-unknown.err
deleted file mode 100644
index 1f43e3ac9..000000000
--- a/qemu/tests/qapi-schema/returns-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/returns-unknown.json:2: 'returns' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/qemu/tests/qapi-schema/returns-unknown.exit b/qemu/tests/qapi-schema/returns-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/returns-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/returns-unknown.json b/qemu/tests/qapi-schema/returns-unknown.json
deleted file mode 100644
index 25bd498bf..000000000
--- a/qemu/tests/qapi-schema/returns-unknown.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject returns if it does not contain a known type
-{ 'command': 'oops', 'returns': 'NoSuchType' }
diff --git a/qemu/tests/qapi-schema/returns-unknown.out b/qemu/tests/qapi-schema/returns-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/returns-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/returns-whitelist.err b/qemu/tests/qapi-schema/returns-whitelist.err
deleted file mode 100644
index f47c1ee7c..000000000
--- a/qemu/tests/qapi-schema/returns-whitelist.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/returns-whitelist.json:10: 'returns' for command 'no-way-this-will-get-whitelisted' cannot use built-in type 'int'
diff --git a/qemu/tests/qapi-schema/returns-whitelist.exit b/qemu/tests/qapi-schema/returns-whitelist.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/returns-whitelist.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/returns-whitelist.json b/qemu/tests/qapi-schema/returns-whitelist.json
deleted file mode 100644
index e8b3cea39..000000000
--- a/qemu/tests/qapi-schema/returns-whitelist.json
+++ /dev/null
@@ -1,11 +0,0 @@
-# we enforce that 'returns' be a dict or array of dict unless whitelisted
-{ 'command': 'human-monitor-command',
- 'data': {'command-line': 'str', '*cpu-index': 'int'},
- 'returns': 'str' }
-{ 'enum': 'TpmModel', 'data': [ 'tpm-tis' ] }
-{ 'command': 'query-tpm-models', 'returns': ['TpmModel'] }
-{ 'command': 'guest-get-time',
- 'returns': 'int' }
-
-{ 'command': 'no-way-this-will-get-whitelisted',
- 'returns': [ 'int' ] }
diff --git a/qemu/tests/qapi-schema/returns-whitelist.out b/qemu/tests/qapi-schema/returns-whitelist.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/returns-whitelist.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/struct-base-clash-deep.err b/qemu/tests/qapi-schema/struct-base-clash-deep.err
deleted file mode 100644
index e2d7943f2..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash-deep.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/struct-base-clash-deep.json:10: 'name' (member of Sub) collides with 'name' (member of Base)
diff --git a/qemu/tests/qapi-schema/struct-base-clash-deep.exit b/qemu/tests/qapi-schema/struct-base-clash-deep.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash-deep.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/struct-base-clash-deep.json b/qemu/tests/qapi-schema/struct-base-clash-deep.json
deleted file mode 100644
index fa873ab5d..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash-deep.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# Reject attempts to duplicate QMP members
-# Here, 'name' would have to appear twice on the wire, locally and
-# indirectly for the grandparent base; the collision doesn't care that
-# one instance is optional.
-{ 'struct': 'Base',
- 'data': { 'name': 'str' } }
-{ 'struct': 'Mid',
- 'base': 'Base',
- 'data': { 'value': 'int' } }
-{ 'struct': 'Sub',
- 'base': 'Mid',
- 'data': { '*name': 'str' } }
diff --git a/qemu/tests/qapi-schema/struct-base-clash-deep.out b/qemu/tests/qapi-schema/struct-base-clash-deep.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash-deep.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/struct-base-clash.err b/qemu/tests/qapi-schema/struct-base-clash.err
deleted file mode 100644
index c52f33d27..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/struct-base-clash.json:5: 'name' (member of Sub) collides with 'name' (member of Base)
diff --git a/qemu/tests/qapi-schema/struct-base-clash.exit b/qemu/tests/qapi-schema/struct-base-clash.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/struct-base-clash.json b/qemu/tests/qapi-schema/struct-base-clash.json
deleted file mode 100644
index 11aec80fe..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash.json
+++ /dev/null
@@ -1,7 +0,0 @@
-# Reject attempts to duplicate QMP members
-# Here, 'name' would have to appear twice on the wire, locally and for base.
-{ 'struct': 'Base',
- 'data': { 'name': 'str' } }
-{ 'struct': 'Sub',
- 'base': 'Base',
- 'data': { 'name': 'str' } }
diff --git a/qemu/tests/qapi-schema/struct-base-clash.out b/qemu/tests/qapi-schema/struct-base-clash.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/struct-base-clash.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/struct-data-invalid.err b/qemu/tests/qapi-schema/struct-data-invalid.err
deleted file mode 100644
index 6644f4c2a..000000000
--- a/qemu/tests/qapi-schema/struct-data-invalid.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/struct-data-invalid.json:1: 'data' for struct 'foo' should be a dictionary or type name
diff --git a/qemu/tests/qapi-schema/struct-data-invalid.exit b/qemu/tests/qapi-schema/struct-data-invalid.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/struct-data-invalid.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/struct-data-invalid.json b/qemu/tests/qapi-schema/struct-data-invalid.json
deleted file mode 100644
index 9adbc3bb6..000000000
--- a/qemu/tests/qapi-schema/struct-data-invalid.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'struct': 'foo',
- 'data': false }
diff --git a/qemu/tests/qapi-schema/struct-data-invalid.out b/qemu/tests/qapi-schema/struct-data-invalid.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/struct-data-invalid.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/struct-member-invalid.err b/qemu/tests/qapi-schema/struct-member-invalid.err
deleted file mode 100644
index 69a326d45..000000000
--- a/qemu/tests/qapi-schema/struct-member-invalid.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/struct-member-invalid.json:1: Member 'a' of 'data' for struct 'foo' should be a type name
diff --git a/qemu/tests/qapi-schema/struct-member-invalid.exit b/qemu/tests/qapi-schema/struct-member-invalid.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/struct-member-invalid.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/struct-member-invalid.json b/qemu/tests/qapi-schema/struct-member-invalid.json
deleted file mode 100644
index 8f172f7a8..000000000
--- a/qemu/tests/qapi-schema/struct-member-invalid.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'struct': 'foo',
- 'data': { 'a': false } }
diff --git a/qemu/tests/qapi-schema/struct-member-invalid.out b/qemu/tests/qapi-schema/struct-member-invalid.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/struct-member-invalid.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/test-qapi.py b/qemu/tests/qapi-schema/test-qapi.py
deleted file mode 100644
index 649677e01..000000000
--- a/qemu/tests/qapi-schema/test-qapi.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# QAPI parser test harness
-#
-# Copyright (c) 2013 Red Hat Inc.
-#
-# Authors:
-# Markus Armbruster <armbru@redhat.com>
-#
-# This work is licensed under the terms of the GNU GPL, version 2 or later.
-# See the COPYING file in the top-level directory.
-#
-
-from qapi import *
-from pprint import pprint
-import os
-import sys
-
-
-class QAPISchemaTestVisitor(QAPISchemaVisitor):
- def visit_enum_type(self, name, info, values, prefix):
- print 'enum %s %s' % (name, values)
- if prefix:
- print ' prefix %s' % prefix
-
- def visit_object_type(self, name, info, base, members, variants):
- print 'object %s' % name
- if base:
- print ' base %s' % base.name
- for m in members:
- print ' member %s: %s optional=%s' % \
- (m.name, m.type.name, m.optional)
- self._print_variants(variants)
-
- def visit_alternate_type(self, name, info, variants):
- print 'alternate %s' % name
- self._print_variants(variants)
-
- def visit_command(self, name, info, arg_type, ret_type,
- gen, success_response):
- print 'command %s %s -> %s' % \
- (name, arg_type and arg_type.name, ret_type and ret_type.name)
- print ' gen=%s success_response=%s' % (gen, success_response)
-
- def visit_event(self, name, info, arg_type):
- print 'event %s %s' % (name, arg_type and arg_type.name)
-
- @staticmethod
- def _print_variants(variants):
- if variants:
- if variants.tag_name:
- print ' tag %s' % variants.tag_name
- for v in variants.variants:
- print ' case %s: %s' % (v.name, v.type.name)
-
-schema = QAPISchema(sys.argv[1])
-schema.visit(QAPISchemaTestVisitor())
diff --git a/qemu/tests/qapi-schema/trailing-comma-list.err b/qemu/tests/qapi-schema/trailing-comma-list.err
deleted file mode 100644
index 24c24b010..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-list.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/trailing-comma-list.json:2:36: Expected "{", "[" or string
diff --git a/qemu/tests/qapi-schema/trailing-comma-list.exit b/qemu/tests/qapi-schema/trailing-comma-list.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-list.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/trailing-comma-list.json b/qemu/tests/qapi-schema/trailing-comma-list.json
deleted file mode 100644
index 9b0c8bd70..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-list.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly', ] }
diff --git a/qemu/tests/qapi-schema/trailing-comma-list.out b/qemu/tests/qapi-schema/trailing-comma-list.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-list.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/trailing-comma-object.err b/qemu/tests/qapi-schema/trailing-comma-object.err
deleted file mode 100644
index 30bce5e19..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-object.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/trailing-comma-object.json:2:38: Expected string
diff --git a/qemu/tests/qapi-schema/trailing-comma-object.exit b/qemu/tests/qapi-schema/trailing-comma-object.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-object.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/trailing-comma-object.json b/qemu/tests/qapi-schema/trailing-comma-object.json
deleted file mode 100644
index bbaea550c..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-object.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'enum': 'Status',
- 'data': [ 'good', 'bad', 'ugly' ], }
diff --git a/qemu/tests/qapi-schema/trailing-comma-object.out b/qemu/tests/qapi-schema/trailing-comma-object.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/trailing-comma-object.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/type-bypass-bad-gen.err b/qemu/tests/qapi-schema/type-bypass-bad-gen.err
deleted file mode 100644
index a83c3c655..000000000
--- a/qemu/tests/qapi-schema/type-bypass-bad-gen.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/type-bypass-bad-gen.json:2: 'gen' of command 'foo' should only use false value
diff --git a/qemu/tests/qapi-schema/type-bypass-bad-gen.exit b/qemu/tests/qapi-schema/type-bypass-bad-gen.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/type-bypass-bad-gen.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/type-bypass-bad-gen.json b/qemu/tests/qapi-schema/type-bypass-bad-gen.json
deleted file mode 100644
index e8dec3424..000000000
--- a/qemu/tests/qapi-schema/type-bypass-bad-gen.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# 'gen' should only appear with value false
-{ 'command': 'foo', 'gen': 'whatever' }
diff --git a/qemu/tests/qapi-schema/type-bypass-bad-gen.out b/qemu/tests/qapi-schema/type-bypass-bad-gen.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/type-bypass-bad-gen.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unclosed-list.err b/qemu/tests/qapi-schema/unclosed-list.err
deleted file mode 100644
index fb41a86ab..000000000
--- a/qemu/tests/qapi-schema/unclosed-list.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unclosed-list.json:1:20: Expected "," or "]"
diff --git a/qemu/tests/qapi-schema/unclosed-list.exit b/qemu/tests/qapi-schema/unclosed-list.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unclosed-list.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unclosed-list.json b/qemu/tests/qapi-schema/unclosed-list.json
deleted file mode 100644
index e3e956698..000000000
--- a/qemu/tests/qapi-schema/unclosed-list.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'key': [ 'value' }
diff --git a/qemu/tests/qapi-schema/unclosed-list.out b/qemu/tests/qapi-schema/unclosed-list.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unclosed-list.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unclosed-object.err b/qemu/tests/qapi-schema/unclosed-object.err
deleted file mode 100644
index db3deedd6..000000000
--- a/qemu/tests/qapi-schema/unclosed-object.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unclosed-object.json:1:21: Expected "," or "}"
diff --git a/qemu/tests/qapi-schema/unclosed-object.exit b/qemu/tests/qapi-schema/unclosed-object.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unclosed-object.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unclosed-object.json b/qemu/tests/qapi-schema/unclosed-object.json
deleted file mode 100644
index 8ac069dce..000000000
--- a/qemu/tests/qapi-schema/unclosed-object.json
+++ /dev/null
@@ -1 +0,0 @@
-{ 'key': [ 'value' ]
diff --git a/qemu/tests/qapi-schema/unclosed-object.out b/qemu/tests/qapi-schema/unclosed-object.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unclosed-object.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unclosed-string.err b/qemu/tests/qapi-schema/unclosed-string.err
deleted file mode 100644
index 12b187074..000000000
--- a/qemu/tests/qapi-schema/unclosed-string.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unclosed-string.json:1:11: Missing terminating "'"
diff --git a/qemu/tests/qapi-schema/unclosed-string.exit b/qemu/tests/qapi-schema/unclosed-string.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unclosed-string.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unclosed-string.json b/qemu/tests/qapi-schema/unclosed-string.json
deleted file mode 100644
index 8c16b6b6f..000000000
--- a/qemu/tests/qapi-schema/unclosed-string.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ 'text': 'lorem ips
-}
diff --git a/qemu/tests/qapi-schema/unclosed-string.out b/qemu/tests/qapi-schema/unclosed-string.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unclosed-string.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unicode-str.err b/qemu/tests/qapi-schema/unicode-str.err
deleted file mode 100644
index f621cd644..000000000
--- a/qemu/tests/qapi-schema/unicode-str.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unicode-str.json:2: 'command' uses invalid name 'é'
diff --git a/qemu/tests/qapi-schema/unicode-str.exit b/qemu/tests/qapi-schema/unicode-str.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unicode-str.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unicode-str.json b/qemu/tests/qapi-schema/unicode-str.json
deleted file mode 100644
index 5253a1b9f..000000000
--- a/qemu/tests/qapi-schema/unicode-str.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we don't support full Unicode strings, yet
-{ 'command': 'é' }
diff --git a/qemu/tests/qapi-schema/unicode-str.out b/qemu/tests/qapi-schema/unicode-str.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unicode-str.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-base-no-discriminator.err b/qemu/tests/qapi-schema/union-base-no-discriminator.err
deleted file mode 100644
index 8b7a24260..000000000
--- a/qemu/tests/qapi-schema/union-base-no-discriminator.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-base-no-discriminator.json:11: Simple union 'TestUnion' must not have a base
diff --git a/qemu/tests/qapi-schema/union-base-no-discriminator.exit b/qemu/tests/qapi-schema/union-base-no-discriminator.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-base-no-discriminator.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-base-no-discriminator.json b/qemu/tests/qapi-schema/union-base-no-discriminator.json
deleted file mode 100644
index 1409cf5c9..000000000
--- a/qemu/tests/qapi-schema/union-base-no-discriminator.json
+++ /dev/null
@@ -1,14 +0,0 @@
-# we reject simple unions with a base (or flat unions without discriminator)
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-
-{ 'struct': 'Base',
- 'data': { 'string': 'str' } }
-
-{ 'union': 'TestUnion',
- 'base': 'Base',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/union-base-no-discriminator.out b/qemu/tests/qapi-schema/union-base-no-discriminator.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-base-no-discriminator.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-branch-case.err b/qemu/tests/qapi-schema/union-branch-case.err
deleted file mode 100644
index 11521901d..000000000
--- a/qemu/tests/qapi-schema/union-branch-case.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-branch-case.json:2: 'Branch' (branch of NoWayThisWillGetWhitelisted) should not use uppercase
diff --git a/qemu/tests/qapi-schema/union-branch-case.exit b/qemu/tests/qapi-schema/union-branch-case.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-branch-case.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-branch-case.json b/qemu/tests/qapi-schema/union-branch-case.json
deleted file mode 100644
index e6565dc3b..000000000
--- a/qemu/tests/qapi-schema/union-branch-case.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# Branch names should be 'lower-case' unless the union is whitelisted
-{ 'union': 'NoWayThisWillGetWhitelisted', 'data': { 'Branch': 'int' } }
diff --git a/qemu/tests/qapi-schema/union-branch-case.out b/qemu/tests/qapi-schema/union-branch-case.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-branch-case.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-clash-branches.err b/qemu/tests/qapi-schema/union-clash-branches.err
deleted file mode 100644
index e5b21135b..000000000
--- a/qemu/tests/qapi-schema/union-clash-branches.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-clash-branches.json:4: 'a_b' (branch of TestUnion) collides with 'a-b' (branch of TestUnion)
diff --git a/qemu/tests/qapi-schema/union-clash-branches.exit b/qemu/tests/qapi-schema/union-clash-branches.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-clash-branches.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-clash-branches.json b/qemu/tests/qapi-schema/union-clash-branches.json
deleted file mode 100644
index 3bece8c94..000000000
--- a/qemu/tests/qapi-schema/union-clash-branches.json
+++ /dev/null
@@ -1,5 +0,0 @@
-# Union branch name collision
-# Reject a union that would result in a collision in generated C names (this
-# would try to generate two members 'a_b').
-{ 'union': 'TestUnion',
- 'data': { 'a-b': 'int', 'a_b': 'str' } }
diff --git a/qemu/tests/qapi-schema/union-clash-branches.out b/qemu/tests/qapi-schema/union-clash-branches.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-clash-branches.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-empty.err b/qemu/tests/qapi-schema/union-empty.err
deleted file mode 100644
index 12c20221b..000000000
--- a/qemu/tests/qapi-schema/union-empty.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-empty.json:2: Union 'Union' cannot have empty 'data'
diff --git a/qemu/tests/qapi-schema/union-empty.exit b/qemu/tests/qapi-schema/union-empty.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-empty.json b/qemu/tests/qapi-schema/union-empty.json
deleted file mode 100644
index 1f0b13ca2..000000000
--- a/qemu/tests/qapi-schema/union-empty.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# unions cannot be empty
-{ 'union': 'Union', 'data': { } }
diff --git a/qemu/tests/qapi-schema/union-empty.out b/qemu/tests/qapi-schema/union-empty.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-empty.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-invalid-base.err b/qemu/tests/qapi-schema/union-invalid-base.err
deleted file mode 100644
index 03d7b97a9..000000000
--- a/qemu/tests/qapi-schema/union-invalid-base.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-invalid-base.json:8: 'base' for union 'TestUnion' cannot use built-in type 'int'
diff --git a/qemu/tests/qapi-schema/union-invalid-base.exit b/qemu/tests/qapi-schema/union-invalid-base.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-invalid-base.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-invalid-base.json b/qemu/tests/qapi-schema/union-invalid-base.json
deleted file mode 100644
index 92be39df6..000000000
--- a/qemu/tests/qapi-schema/union-invalid-base.json
+++ /dev/null
@@ -1,12 +0,0 @@
-# a union base type must be a struct
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
-
-{ 'union': 'TestUnion',
- 'base': 'int',
- 'discriminator': 'int',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
diff --git a/qemu/tests/qapi-schema/union-invalid-base.out b/qemu/tests/qapi-schema/union-invalid-base.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-invalid-base.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-optional-branch.err b/qemu/tests/qapi-schema/union-optional-branch.err
deleted file mode 100644
index 3ada1334d..000000000
--- a/qemu/tests/qapi-schema/union-optional-branch.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-optional-branch.json:2: Member of union 'Union' does not allow optional name '*a'
diff --git a/qemu/tests/qapi-schema/union-optional-branch.exit b/qemu/tests/qapi-schema/union-optional-branch.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-optional-branch.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-optional-branch.json b/qemu/tests/qapi-schema/union-optional-branch.json
deleted file mode 100644
index 591615fc6..000000000
--- a/qemu/tests/qapi-schema/union-optional-branch.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# union branches cannot be optional
-{ 'union': 'Union', 'data': { '*a': 'int', 'b': 'str' } }
diff --git a/qemu/tests/qapi-schema/union-optional-branch.out b/qemu/tests/qapi-schema/union-optional-branch.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-optional-branch.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/union-unknown.err b/qemu/tests/qapi-schema/union-unknown.err
deleted file mode 100644
index 54fe456f9..000000000
--- a/qemu/tests/qapi-schema/union-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/union-unknown.json:2: Member 'unknown' of union 'Union' uses unknown type 'MissingType'
diff --git a/qemu/tests/qapi-schema/union-unknown.exit b/qemu/tests/qapi-schema/union-unknown.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/union-unknown.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/union-unknown.json b/qemu/tests/qapi-schema/union-unknown.json
deleted file mode 100644
index aa7e8143d..000000000
--- a/qemu/tests/qapi-schema/union-unknown.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we reject a union with unknown type in branch
-{ 'union': 'Union',
- 'data': { 'unknown': 'MissingType' } }
diff --git a/qemu/tests/qapi-schema/union-unknown.out b/qemu/tests/qapi-schema/union-unknown.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/union-unknown.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unknown-escape.err b/qemu/tests/qapi-schema/unknown-escape.err
deleted file mode 100644
index 000e30ddf..000000000
--- a/qemu/tests/qapi-schema/unknown-escape.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unknown-escape.json:3:21: Unknown escape \x
diff --git a/qemu/tests/qapi-schema/unknown-escape.exit b/qemu/tests/qapi-schema/unknown-escape.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unknown-escape.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unknown-escape.json b/qemu/tests/qapi-schema/unknown-escape.json
deleted file mode 100644
index 8e6891e52..000000000
--- a/qemu/tests/qapi-schema/unknown-escape.json
+++ /dev/null
@@ -1,3 +0,0 @@
-# we only recognize JSON escape sequences, plus our \' extension (no \x)
-# { 'command': 'foo', 'data': {} }
-{ 'command': 'foo', 'dat\x61':{} }
diff --git a/qemu/tests/qapi-schema/unknown-escape.out b/qemu/tests/qapi-schema/unknown-escape.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unknown-escape.out
+++ /dev/null
diff --git a/qemu/tests/qapi-schema/unknown-expr-key.err b/qemu/tests/qapi-schema/unknown-expr-key.err
deleted file mode 100644
index 12f5ed5b4..000000000
--- a/qemu/tests/qapi-schema/unknown-expr-key.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unknown-expr-key.json:2: Unknown key 'bogus' in struct 'bar'
diff --git a/qemu/tests/qapi-schema/unknown-expr-key.exit b/qemu/tests/qapi-schema/unknown-expr-key.exit
deleted file mode 100644
index d00491fd7..000000000
--- a/qemu/tests/qapi-schema/unknown-expr-key.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/qemu/tests/qapi-schema/unknown-expr-key.json b/qemu/tests/qapi-schema/unknown-expr-key.json
deleted file mode 100644
index 3b2be00cc..000000000
--- a/qemu/tests/qapi-schema/unknown-expr-key.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# we reject an expression with unknown top-level keys
-{ 'struct': 'bar', 'data': { 'string': 'str'}, 'bogus': { } }
diff --git a/qemu/tests/qapi-schema/unknown-expr-key.out b/qemu/tests/qapi-schema/unknown-expr-key.out
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/tests/qapi-schema/unknown-expr-key.out
+++ /dev/null