Re: [Qemu-devel] [PATCH] qapi: fix flat union on uncovered branches conditionals

[Thomas Huth]

On 2018-12-17 21:40, Marc-André Lureau wrote:
> Default branches variant should use the member conditional.
> 
> This fixes compilation with --disable-replication.
> 
> Fixes: 335d10cd8e2c3bb6067804b095aaf6371fc1983e
> 
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  scripts/qapi/common.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index 8c2d97369e..d385a08270 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -1460,7 +1460,7 @@ 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:

This fixes the compilation problem for me, indeed!

Tested-by: Thomas Huth <address@hidden>