Commit ce1a1aec authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

qapi: fix flat union on uncovered branches conditionals 



Default branches variant should use the member conditional.

This fixes compilation with --disable-replication.

Fixes: 335d10cd

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181217204046.14861-1-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Long line wrapped]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent fb064112

scripts/qapi/common.py

+2 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,8 @@ class QAPISchemaObjectTypeVariants(object): 
            cases = set([v.name for v in self.variants])

            for m in self.tag_member.type.members:

                if m.name not in cases:

                    v = QAPISchemaObjectTypeVariant(m.name, 'q_empty')

                    v = QAPISchemaObjectTypeVariant(m.name, 'q_empty',

                                                    m.ifcond)

                    v.set_owner(self.tag_member.owner)

                    self.variants.append(v)

        for v in self.variants: