From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- qemu/tests/qapi-schema/flat-union-clash-member.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 qemu/tests/qapi-schema/flat-union-clash-member.json (limited to 'qemu/tests/qapi-schema/flat-union-clash-member.json') diff --git a/qemu/tests/qapi-schema/flat-union-clash-member.json b/qemu/tests/qapi-schema/flat-union-clash-member.json new file mode 100644 index 000000000..9efc7719b --- /dev/null +++ b/qemu/tests/qapi-schema/flat-union-clash-member.json @@ -0,0 +1,15 @@ +# 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' } } -- cgit 1.2.3-korg