diff mbox series

[PULL,7/7] qapi: fix flat union on uncovered branches conditionals

Message ID 20181218100941.25267-8-armbru@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,1/7] qapi: Turn ShutdownCause into QAPI enum | expand

Commit Message

Markus Armbruster Dec. 18, 2018, 10:09 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

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>
---
 scripts/qapi/common.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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: