Commit 48eb62a7 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Drop useless 'data' member of unions 



We started moving away from the use of the 'void *data' member
in the C union corresponding to a QAPI union back in commit
544a3731; recent commits have gotten rid of other uses.  Now
that it is completely unused, we can remove the member itself
as well as the FIXME comment.  Update the testsuite to drop the
negative test union-clash-data.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <1457021813-10704-11-git-send-email-eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent b1918fbb

scripts/qapi-types.py

+0 −9
Original line number Diff line number Diff line
@@ -116,17 +116,8 @@ static inline %(base)s *qapi_%(c_name)s_base(const %(c_name)s *obj) 




def gen_variants(variants):

    # FIXME: What purpose does data serve, besides preventing a union that

    # has a branch named 'data'? We use it in qapi-visit.py to decide

    # whether to bypass the switch statement if visiting the discriminator

    # failed; but since we 0-initialize structs, and cannot tell what

    # branch of the union is in use if the discriminator is invalid, there

    # should not be any data leaks even without a data pointer.  Or, if

    # 'data' is merely added to guarantee we don't have an empty union,

    # shouldn't we enforce that at .json parse time?

    ret = mcgen('''

    union { /* union tag is @%(c_name)s */

        void *data;

''',

                c_name=c_name(variants.tag_member.name))

tests/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ qapi-schema += unicode-str.json 
qapi-schema += union-base-no-discriminator.json

qapi-schema += union-branch-case.json

qapi-schema += union-clash-branches.json

qapi-schema += union-clash-data.json

qapi-schema += union-empty.json

qapi-schema += union-invalid-base.json

qapi-schema += union-optional-branch.json

tests/qapi-schema/union-clash-data.err

deleted100644 → 0
+0 −0

Empty file deleted.

tests/qapi-schema/union-clash-data.exit

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
0

tests/qapi-schema/union-clash-data.json

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
# Union branch 'data'

# FIXME: this parses, but then fails to compile due to a duplicate 'data'

# (one from the branch name, another as a filler to avoid an empty union).

# we should either detect the collision at parse time, or change the

# generated struct to allow this to compile.

{ 'union': 'TestUnion',

  'data': { 'data': 'int' } }