diff options
| author | Peter Maydell | 2017-06-01 17:39:16 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-01 17:39:16 +0200 |
| commit | 43771d5d92312504305c19abe29ec5bfabd55f01 (patch) | |
| tree | 9dc7719fb3b71f42f669b190126b1cf4731a1d08 /tests/qapi-schema/alternate-conflict-string.err | |
| parent | Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20170531' int... (diff) | |
| parent | qapi: Reject alternates that can't work with keyval_parse() (diff) | |
| download | qemu-43771d5d92312504305c19abe29ec5bfabd55f01.tar.gz qemu-43771d5d92312504305c19abe29ec5bfabd55f01.tar.xz qemu-43771d5d92312504305c19abe29ec5bfabd55f01.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-05-31' into staging
QAPI patches for 2017-05-31
# gpg: Signature made Wed 31 May 2017 18:06:39 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-05-31:
qapi: Reject alternates that can't work with keyval_parse()
tests/qapi-schema: Avoid 'str' in alternate test cases
qapi: Document visit_type_any() issues with keyval input
qobject-input-visitor: Reject non-finite numbers with keyval
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qapi-schema/alternate-conflict-string.err')
| -rw-r--r-- | tests/qapi-schema/alternate-conflict-string.err | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/alternate-conflict-string.err b/tests/qapi-schema/alternate-conflict-string.err index fc523b0879..fe2f188295 100644 --- a/tests/qapi-schema/alternate-conflict-string.err +++ b/tests/qapi-schema/alternate-conflict-string.err @@ -1 +1 @@ -tests/qapi-schema/alternate-conflict-string.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one' +tests/qapi-schema/alternate-conflict-string.json:2: Alternate 'Alt' member 'two' can't be distinguished from member 'one' |