From: Marc-André Lureau Date: Mon, 17 Dec 2018 20:40:46 +0000 (+0400) Subject: qapi: fix flat union on uncovered branches conditionals X-Git-Tag: v4.0.0-rc0~202^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce1a1aec47877a281d69dbc2e65f86bfe8fea231;p=users%2Fdwmw2%2Fqemu.git qapi: fix flat union on uncovered branches conditionals Default branches variant should use the member conditional. This fixes compilation with --disable-replication. Fixes: 335d10cd8e2c3bb6067804b095aaf6371fc1983e Signed-off-by: Marc-André Lureau Message-Id: <20181217204046.14861-1-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster [Long line wrapped] Signed-off-by: Markus Armbruster --- diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 8c2d97369e..c89edc0cb0 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -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: