summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-12-18 00:40:46 +0400
committerMarkus Armbruster <armbru@redhat.com>2018-12-18 07:57:36 +0100
commitce1a1aec47877a281d69dbc2e65f86bfe8fea231 (patch)
treeb86efab46927a87de28631abf7e74397f1b4599d
parentfb0641121072d9d612773370688a6887bb78db08 (diff)
downloadfocaccia-qemu-ce1a1aec47877a281d69dbc2e65f86bfe8fea231.tar.gz
focaccia-qemu-ce1a1aec47877a281d69dbc2e65f86bfe8fea231.zip
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 <marcandre.lureau@redhat.com>
Message-Id: <20181217204046.14861-1-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Long line wrapped]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--scripts/qapi/common.py3
1 files changed, 2 insertions, 1 deletions
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: