From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN2sl-0005lY-E6 for qemu-devel@nongnu.org; Mon, 10 Mar 2014 12:16:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WN2sh-0002LR-1e for qemu-devel@nongnu.org; Mon, 10 Mar 2014 12:16:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WN2sg-0002LB-Oi for qemu-devel@nongnu.org; Mon, 10 Mar 2014 12:16:46 -0400 Date: Mon, 10 Mar 2014 12:16:42 -0400 From: Luiz Capitulino Message-ID: <20140310121642.3a28896e@redhat.com> In-Reply-To: <1394463290-24929-1-git-send-email-armbru@redhat.com> References: <1394463290-24929-1-git-send-email-armbru@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] tests/qapi-schema: Fix enum misuse in flat union type tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org On Mon, 10 Mar 2014 15:54:50 +0100 Markus Armbruster wrote: > Screwed up in commit 2fc0043. Currently harmless, because the enum > values happen to be identical. I'm afraid this conflicts with Wenchao's series: [PATCH V9 00/10] qapi script: support enum as discriminator and better enum name Which is already merged in my qmp queue: git://repo.or.cz/qemu/qmp-unstable.git queue/qmp > > Reported-by: Peter Maydell > Signed-off-by: Markus Armbruster > --- > tests/test-qmp-input-visitor.c | 2 +- > tests/test-qmp-output-visitor.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c > index 2dffafc..0b9256b 100644 > --- a/tests/test-qmp-input-visitor.c > +++ b/tests/test-qmp-input-visitor.c > @@ -315,7 +315,7 @@ static void test_visitor_in_union_flat(TestInputVisitorData *data, > > visit_type_UserDefFlatUnion(v, &tmp, NULL, &err); > g_assert(err == NULL); > - g_assert_cmpint(tmp->kind, ==, USER_DEF_UNION_KIND_A); > + g_assert_cmpint(tmp->kind, ==, USER_DEF_FLAT_UNION_KIND_A); > /* TODO g_assert_cmpint(tmp->integer, ==, 41); */ > g_assert_cmpint(tmp->a->boolean, ==, true); > qapi_free_UserDefFlatUnion(tmp); > diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c > index 105f4cf..603616a 100644 > --- a/tests/test-qmp-output-visitor.c > +++ b/tests/test-qmp-output-visitor.c > @@ -449,7 +449,7 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data, > Error *err = NULL; > > UserDefFlatUnion *tmp = g_malloc0(sizeof(UserDefFlatUnion)); > - tmp->kind = USER_DEF_UNION_KIND_A; > + tmp->kind = USER_DEF_FLAT_UNION_KIND_A; > tmp->a = g_malloc0(sizeof(UserDefA)); > /* TODO when generator bug is fixed: tmp->integer = 41; */ > tmp->a->boolean = true;