[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] tests/qapi-schema: Fix enum misuse in flat unio
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH] tests/qapi-schema: Fix enum misuse in flat union type tests |
Date: |
Mon, 10 Mar 2014 12:16:42 -0400 |
On Mon, 10 Mar 2014 15:54:50 +0100
Markus Armbruster <address@hidden> 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 <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> 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;